diff options
Diffstat (limited to 'gnustep-libs')
| -rw-r--r-- | gnustep-libs/gdl2/ChangeLog | 10 | ||||
| -rw-r--r-- | gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch | 10 | ||||
| -rw-r--r-- | gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch | 118 | ||||
| -rw-r--r-- | gnustep-libs/gdl2/gdl2-0.11.0.ebuild | 14 |
4 files changed, 147 insertions, 5 deletions
diff --git a/gnustep-libs/gdl2/ChangeLog b/gnustep-libs/gdl2/ChangeLog index 4be1badb1241..5985713eead1 100644 --- a/gnustep-libs/gdl2/ChangeLog +++ b/gnustep-libs/gdl2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnustep-libs/gdl2 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/ChangeLog,v 1.10 2007/12/08 18:01:38 voyageur Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/ChangeLog,v 1.11 2008/01/20 23:39:38 voyageur Exp $ + + 20 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org> + +files/gdl2-0.11.0-NSMutableDictionary.patch, + +files/gdl2-0.11.0-makefile.patch, gdl2-0.11.0.ebuild: + Fix Makefiles (and disable tools compilation), bug #206546 + Fix compilation with unstable gnustep *gdl2-0.11.0 (08 Dec 2007) diff --git a/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch b/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch new file mode 100644 index 000000000000..8e1a63bc8259 --- /dev/null +++ b/gnustep-libs/gdl2/files/gdl2-0.11.0-NSMutableDictionary.patch @@ -0,0 +1,10 @@ +--- gnustep-dl2-0.11.0/EOControl/EOClassDescription.h.orig 2008-01-20 17:40:22.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOControl/EOClassDescription.h 2008-01-20 17:40:24.000000000 +0100 +@@ -39,6 +39,7 @@ + + @class NSDictionary; + @class NSFormatter; ++@class NSMutableDictionary; + @class EOEditingContext; + @class EOGlobalID; + @class EORelationship; diff --git a/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch b/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch new file mode 100644 index 000000000000..e67463842ca3 --- /dev/null +++ b/gnustep-libs/gdl2/files/gdl2-0.11.0-makefile.patch @@ -0,0 +1,118 @@ +diff -Naur gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile gnustep-dl2-0.11.0/DBModeler/GNUmakefile +--- gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/DBModeler/GNUmakefile 2008-01-21 00:20:04.000000000 +0100 +@@ -30,7 +30,7 @@ + DBModeler_SUBPROJECTS=Inspectors + + ADDITIONAL_INCLUDE_DIRS+=-I../ +-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler ++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler + ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler + + $(APP_NAME)_RESOURCE_FILES = \ +diff -Naur gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble gnustep-dl2-0.11.0/EOAccess/Makefile.preamble +--- gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOAccess/Makefile.preamble 2008-01-21 00:20:04.000000000 +0100 +@@ -75,7 +75,7 @@ + + ADDITIONAL_NATIVE_LIBS += EOControl + +-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl + + ifeq ($(FOUNDATION_HAS_KVC), yes) + ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1 +diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile +--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile 2008-01-21 00:20:04.000000000 +0100 +@@ -40,7 +40,7 @@ + LoginPanel_INCLUDE_DIRS = -I.. -I../../.. + + ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl +-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess ++override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess + + ifneq ($(FOUNDATION_LIB),gnu) + LoginPanel_OBJC_LIBS += -lgnustep-baseadd +diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble +--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble 2008-01-21 00:20:04.000000000 +0100 +@@ -57,7 +57,7 @@ + + # Libraries linked to the framework + ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl +-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess ++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess + ifneq ($(FOUNDATION_LIB),gnu) + LIBRARIES_DEPEND_UPON += -lgnustep-baseadd + endif +diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in +--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in 2008-01-21 00:20:04.000000000 +0100 +@@ -30,7 +30,7 @@ + LIBRARIES_DEPEND_UPON+=@SQLITE3_LIBS@ + FRAMEWORK_NAME=SQLite3EOAdaptor + +-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess ++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess + ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess + ADDITIONAL_INCLUDE_DIRS+=-I../../ + +diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile +--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile 2008-01-21 00:20:04.000000000 +0100 +@@ -37,7 +37,7 @@ + + LoginPanel_INCLUDE_DIRS=-I.. -I../../../ + ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl +-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess ++override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess + + ifneq ($(FOUNDATION_LIB),gnu) + LoginPanel_OBJC_LIBS+=-lgnustep-baseadd +diff -Naur gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble gnustep-dl2-0.11.0/EOInterface/Makefile.preamble +--- gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOInterface/Makefile.preamble 2008-01-21 00:20:04.000000000 +0100 +@@ -64,6 +64,6 @@ + LIBRARIES_DEPEND_UPON += -lgnustep-baseadd + endif + +-ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess ++override ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess + + ADDITIONAL_NATIVE_LIBS += EOControl EOAccess +diff -Naur gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble gnustep-dl2-0.11.0/EOModeler/Makefile.preamble +--- gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/EOModeler/Makefile.preamble 2008-01-21 00:20:04.000000000 +0100 +@@ -72,6 +72,6 @@ + LIBRARIES_DEPEND_UPON += -lgnustep-baseadd + endif + +-ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl ++override ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl + + ADDITIONAL_NATIVE_LIBS += EOControl EOAccess +diff -Naur gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile +--- gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile 2008-01-21 00:20:04.000000000 +0100 +@@ -31,7 +31,7 @@ + GDL2_PRINCIPAL_CLASS = GDL2Palette + + ADDITIONAL_INCLUDE_DIRS+=-I../ +-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler ++override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler + ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler + + GDL2_RESOURCE_FILES= \ +diff -Naur gnustep-dl2-0.11.0.orig/GNUmakefile.in gnustep-dl2-0.11.0/GNUmakefile.in +--- gnustep-dl2-0.11.0.orig/GNUmakefile.in 2008-01-21 00:19:57.000000000 +0100 ++++ gnustep-dl2-0.11.0/GNUmakefile.in 2008-01-21 00:21:51.000000000 +0100 +@@ -36,7 +36,7 @@ + # + # The list of subproject directories + # +-SUBPROJECTS = EOControl EOAccess EOAdaptors Tools ++SUBPROJECTS = EOControl EOAccess EOAdaptors + + ifeq ($(GUI_MAKE_LOADED),yes) + SUBPROJECTS += EOInterface EOModeler DBModeler GDL2Palette diff --git a/gnustep-libs/gdl2/gdl2-0.11.0.ebuild b/gnustep-libs/gdl2/gdl2-0.11.0.ebuild index dbab22ee1c55..3f3d059dd596 100644 --- a/gnustep-libs/gdl2/gdl2-0.11.0.ebuild +++ b/gnustep-libs/gdl2/gdl2-0.11.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/gdl2-0.11.0.ebuild,v 1.1 2007/12/08 18:01:38 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gdl2/gdl2-0.11.0.ebuild,v 1.2 2008/01/20 23:39:38 voyageur Exp $ inherit gnustep-2 @@ -18,5 +18,13 @@ S=${WORKDIR}/${MY_P} DEPEND="!gnustep-apps/sope postgres? ( dev-db/libpq ) - sqlite? ( dev-db/sqlite )" + sqlite? ( >=dev-db/sqlite-3 )" RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-makefile.patch + epatch "${FILESDIR}"/${P}-NSMutableDictionary.patch +} |