SOURCES: sope-gsmake2.patch (NEW), sope-crypt.patch (NEW), sope-_e...
aredridel
aredridel at pld-linux.org
Wed Apr 2 16:52:17 CEST 2008
Author: aredridel Date: Wed Apr 2 14:52:17 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added
---- Files affected:
SOURCES:
sope-gsmake2.patch (NONE -> 1.1) (NEW), sope-crypt.patch (NONE -> 1.1) (NEW), sope-_e_info.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/sope-gsmake2.patch
diff -u /dev/null SOURCES/sope-gsmake2.patch:1.1
--- /dev/null Wed Apr 2 16:52:17 2008
+++ SOURCES/sope-gsmake2.patch Wed Apr 2 16:52:12 2008
@@ -0,0 +1,361 @@
+diff -Nur sope.orig/gnustep-make/Documentation/GNUmakefile sope.gsmake2/gnustep-make/Documentation/GNUmakefile
+--- sope.orig/gnustep-make/Documentation/GNUmakefile 2007-06-11 09:00:44.000000000 -0600
++++ sope.gsmake2/gnustep-make/Documentation/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -55,9 +55,6 @@
+ # We have a gnustep-make installation to use. The following is a
+ # normal gnustep-make GNUmakefile for documentation.
+
+-# We normally install into System
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+ # The documents to be generated
+diff -Nur sope.orig/libFoundation/examples/GNUmakefile sope.gsmake2/libFoundation/examples/GNUmakefile
+--- sope.orig/libFoundation/examples/GNUmakefile 2007-06-11 09:00:30.000000000 -0600
++++ sope.gsmake2/libFoundation/examples/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -34,8 +34,6 @@
+ # ZNeK: hardcoded this due to removal of support for other runtimes
+ OBJC_RUNTIME=GNU
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ include $(GNUSTEP_MAKEFILES)/common.make
+ -include ../Foundation/libFoundation.make
+
+diff -Nur sope.orig/libFoundation/Foundation/GNUmakefile sope.gsmake2/libFoundation/Foundation/GNUmakefile
+--- sope.orig/libFoundation/Foundation/GNUmakefile 2007-06-11 09:00:26.000000000 -0600
++++ sope.gsmake2/libFoundation/Foundation/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -35,8 +35,6 @@
+ # ZNeK: hardcoded this due to removal of support for other runtimes
+ OBJC_RUNTIME=GNU
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ #include libFoundation.make
+ include $(GNUSTEP_MAKEFILES)/common.make
+ -include libFoundation.make # not available in make distclean
+diff -Nur sope.orig/libFoundation/GNUmakefile sope.gsmake2/libFoundation/GNUmakefile
+--- sope.orig/libFoundation/GNUmakefile 2007-06-11 09:00:30.000000000 -0600
++++ sope.gsmake2/libFoundation/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -33,8 +33,6 @@
+
+ else
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ include $(GNUSTEP_MAKEFILES)/common.make
+ include ./Version
+
+diff -Nur sope.orig/libFoundation/Resources/GNUmakefile sope.gsmake2/libFoundation/Resources/GNUmakefile
+--- sope.orig/libFoundation/Resources/GNUmakefile 2007-06-11 09:00:29.000000000 -0600
++++ sope.gsmake2/libFoundation/Resources/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -31,8 +31,6 @@
+
+ TOP = ..
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ -include $(GNUSTEP_MAKEFILES)/common.make
+ -include $(TOP)/Foundation/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)/config.mak
+ -include $(TOP)/config.mak
+@@ -71,7 +69,7 @@
+ all clean distclean realclean check check-all:
+
+ ifeq ($(FHS_INSTALL_ROOT),)
+-INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Libraries/Resources/libFoundation
++INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/Resources/libFoundation
+ else
+ INSTALL_DIR = $(FHS_INSTALL_ROOT)/share/libFoundation
+ endif
+diff -Nur sope.orig/sope-appserver/mod_ngobjweb/GNUmakefile sope.gsmake2/sope-appserver/mod_ngobjweb/GNUmakefile
+--- sope.orig/sope-appserver/mod_ngobjweb/GNUmakefile 2007-06-11 09:00:52.000000000 -0600
++++ sope.gsmake2/sope-appserver/mod_ngobjweb/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -71,7 +71,7 @@
+ APR_INCLUDE_DIRS = -I$(shell $(APR) --includedir)
+ endif
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/WOAdaptors/Apache
++GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LIBRARY)/WOAdaptors/Apache
+
+ CC = gcc
+ LD = gcc
+diff -Nur sope.orig/sope-appserver/NGObjWeb/GNUmakefile sope.gsmake2/sope-appserver/NGObjWeb/GNUmakefile
+--- sope.orig/sope-appserver/NGObjWeb/GNUmakefile 2007-06-11 09:00:58.000000000 -0600
++++ sope.gsmake2/sope-appserver/NGObjWeb/GNUmakefile 2008-03-31 21:37:37.000000000 -0600
+@@ -4,8 +4,6 @@
+ include ../common.make
+ include ./Version
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ ifneq ($(frameworks),yes)
+ LIBRARY_NAME = libNGObjWeb
+ else
+@@ -165,7 +163,7 @@
+
+ BUNDLE_NAME = SoCore
+ BUNDLE_EXTENSION = .sxp
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ SoCore_PCH_FILE = common.h
+ SoCore_OBJC_FILES = SoCoreProduct.m
+diff -Nur sope.orig/sope-appserver/NGObjWeb/GNUmakefile.postamble sope.gsmake2/sope-appserver/NGObjWeb/GNUmakefile.postamble
+--- sope.orig/sope-appserver/NGObjWeb/GNUmakefile.postamble 2007-06-11 09:00:57.000000000 -0600
++++ sope.gsmake2/sope-appserver/NGObjWeb/GNUmakefile.postamble 2008-03-31 21:33:44.000000000 -0600
+@@ -24,13 +24,13 @@
+ # install makefiles
+
+ after-install ::
+- $(MKDIRS) $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/
+- $(INSTALL_DATA) ngobjweb.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
++ $(MKDIRS) $(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/
++ $(INSTALL_DATA) ngobjweb.make $(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
+
+ ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
+ after-install ::
+ $(INSTALL_DATA) woapp-gs.make \
+- $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make
++ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/woapp.make
+ $(INSTALL_DATA) wobundle-gs.make \
+- $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
++ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
+ endif
+diff -Nur sope.orig/sope-appserver/NGObjWeb/NGHttp/GNUmakefile sope.gsmake2/sope-appserver/NGObjWeb/NGHttp/GNUmakefile
+--- sope.orig/sope-appserver/NGObjWeb/NGHttp/GNUmakefile 2007-06-11 09:00:57.000000000 -0600
++++ sope.gsmake2/sope-appserver/NGObjWeb/NGHttp/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -3,8 +3,6 @@
+ -include ../../../config.make
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ SUBPROJECT_NAME = NGHttp
+
+ NGHttp_PCH_FILE = common.h
+diff -Nur sope.orig/sope-appserver/SoOFS/GNUmakefile sope.gsmake2/sope-appserver/SoOFS/GNUmakefile
+--- sope.orig/sope-appserver/SoOFS/GNUmakefile 2007-06-11 09:00:50.000000000 -0600
++++ sope.gsmake2/sope-appserver/SoOFS/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -75,7 +75,7 @@
+
+ BUNDLE_NAME = SoOFS
+ BUNDLE_EXTENSION = .sxp
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ SoOFS_OBJC_FILES = SoOFSProduct.m
+ SoOFS_RESOURCE_FILES = product.plist Version
+diff -Nur sope.orig/sope-appserver/WEExtensions/GNUmakefile sope.gsmake2/sope-appserver/WEExtensions/GNUmakefile
+--- sope.orig/sope-appserver/WEExtensions/GNUmakefile 2007-06-11 09:00:52.000000000 -0600
++++ sope.gsmake2/sope-appserver/WEExtensions/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -11,7 +11,7 @@
+
+ BUNDLE_NAME = WEExtensions
+ BUNDLE_EXTENSION = .wox
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ else
+ FRAMEWORK_NAME = WEExtensions
+diff -Nur sope.orig/sope-appserver/WEPrototype/GNUmakefile sope.gsmake2/sope-appserver/WEPrototype/GNUmakefile
+--- sope.orig/sope-appserver/WEPrototype/GNUmakefile 2007-06-11 09:01:00.000000000 -0600
++++ sope.gsmake2/sope-appserver/WEPrototype/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -10,7 +10,7 @@
+
+ BUNDLE_NAME = WEPrototype
+ BUNDLE_EXTENSION = .wox
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ else
+ FRAMEWORK_NAME = WEPrototype
+ endif
+diff -Nur sope.orig/sope-appserver/WOExtensions/GNUmakefile sope.gsmake2/sope-appserver/WOExtensions/GNUmakefile
+--- sope.orig/sope-appserver/WOExtensions/GNUmakefile 2007-06-11 09:01:06.000000000 -0600
++++ sope.gsmake2/sope-appserver/WOExtensions/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -9,7 +9,7 @@
+ LIBRARY_NAME = libWOExtensions
+ BUNDLE_NAME = WOExtensions
+ BUNDLE_EXTENSION = .wox
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ else
+ FRAMEWORK_NAME = WOExtensions
+diff -Nur sope.orig/sope-gdl1/FrontBase2/GNUmakefile sope.gsmake2/sope-gdl1/FrontBase2/GNUmakefile
+--- sope.orig/sope-gdl1/FrontBase2/GNUmakefile 2007-06-11 09:00:14.000000000 -0600
++++ sope.gsmake2/sope-gdl1/FrontBase2/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -30,8 +30,6 @@
+
+ ifeq ($(CAN_COMPILE_FB),yes)
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ BUNDLE_NAME = FrontBase2
+
+ FrontBase2_OBJC_FILES = \
+@@ -51,7 +49,7 @@
+ FrontBase2_RESOURCE_FILES = Info.plist Version
+
+ BUNDLE_INSTALL = FrontBase2
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Libraries/Adaptors
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Adaptors
+
+ # Use .gdladaptor as the bundle extension
+ BUNDLE_EXTENSION = .gdladaptor
+diff -Nur sope.orig/sope-gdl1/GDLAccess/GNUmakefile sope.gsmake2/sope-gdl1/GDLAccess/GNUmakefile
+--- sope.orig/sope-gdl1/GDLAccess/GNUmakefile 2007-06-11 09:00:16.000000000 -0600
++++ sope.gsmake2/sope-gdl1/GDLAccess/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -5,8 +5,6 @@
+ -include ../Version
+ -include ./Version
+
+-GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT}
+-
+ ifneq ($(frameworks),yes)
+ LIBRARY_NAME = libGDLAccess
+ else
+diff -Nur sope.orig/sope-gdl1/GDLContentStore/GNUmakefile sope.gsmake2/sope-gdl1/GDLContentStore/GNUmakefile
+--- sope.orig/sope-gdl1/GDLContentStore/GNUmakefile 2007-06-11 09:00:16.000000000 -0600
++++ sope.gsmake2/sope-gdl1/GDLContentStore/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -5,8 +5,6 @@
+ -include ../Version
+ include ./Version
+
+-GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT}
+-
+ ifneq ($(frameworks),yes)
+ LIBRARY_NAME = libGDLContentStore
+ else
+diff -Nur sope.orig/sope-gdl1/MySQL/GNUmakefile.preamble sope.gsmake2/sope-gdl1/MySQL/GNUmakefile.preamble
+--- sope.orig/sope-gdl1/MySQL/GNUmakefile.preamble 2007-06-11 09:00:13.000000000 -0600
++++ sope.gsmake2/sope-gdl1/MySQL/GNUmakefile.preamble 2008-03-31 21:33:44.000000000 -0600
+@@ -27,7 +27,7 @@
+ ifeq ($(frameworks),yes)
+ BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ endif
+
+
+diff -Nur sope.orig/sope-gdl1/PostgreSQL/GNUmakefile.preamble sope.gsmake2/sope-gdl1/PostgreSQL/GNUmakefile.preamble
+--- sope.orig/sope-gdl1/PostgreSQL/GNUmakefile.preamble 2007-06-11 09:00:13.000000000 -0600
++++ sope.gsmake2/sope-gdl1/PostgreSQL/GNUmakefile.preamble 2008-03-31 21:33:44.000000000 -0600
+@@ -27,7 +27,7 @@
+ ifeq ($(frameworks),yes)
+ BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ endif
+
+
+diff -Nur sope.orig/sope-gdl1/SQLite3/GNUmakefile.preamble sope.gsmake2/sope-gdl1/SQLite3/GNUmakefile.preamble
+--- sope.orig/sope-gdl1/SQLite3/GNUmakefile.preamble 2007-06-11 09:00:13.000000000 -0600
++++ sope.gsmake2/sope-gdl1/SQLite3/GNUmakefile.preamble 2008-03-31 21:33:44.000000000 -0600
+@@ -27,7 +27,7 @@
+ ifeq ($(frameworks),yes)
+ BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/
+ else
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/
+ endif
+
+
+diff -Nur sope.orig/sope-ical/NGiCal/GNUmakefile.postamble sope.gsmake2/sope-ical/NGiCal/GNUmakefile.postamble
+--- sope.orig/sope-ical/NGiCal/GNUmakefile.postamble 2007-06-11 09:01:08.000000000 -0600
++++ sope.gsmake2/sope-ical/NGiCal/GNUmakefile.postamble 2008-03-31 21:33:44.000000000 -0600
+@@ -1,7 +1,7 @@
+ # compilation settings
+
+ ifeq ($(FHS_INSTALL_ROOT),)
+-MAPDIR="$(GNUSTEP_INSTALLATION_DIR)/Library/SaxMappings/"
++MAPDIR="$(GNUSTEP_LIBRARY)/SaxMappings/"
+ else
+ MAPDIR="$(FHS_INSTALL_ROOT)/share/sope-$(MAJOR_VERSION).$(MINOR_VERSION)/saxmappings/"
+ endif
+diff -Nur sope.orig/sope-ical/versitSaxDriver/GNUmakefile sope.gsmake2/sope-ical/versitSaxDriver/GNUmakefile
+--- sope.orig/sope-ical/versitSaxDriver/GNUmakefile 2007-06-11 09:01:06.000000000 -0600
++++ sope.gsmake2/sope-ical/versitSaxDriver/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -7,7 +7,7 @@
+
+ BUNDLE_NAME = versitSaxDriver
+ BUNDLE_EXTENSION = .sax
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ versitSaxDriver_PRINCIPAL_CLASS = VSSaxDriver
+
+diff -Nur sope.orig/sope-ldap/NGLdap/GNUmakefile sope.gsmake2/sope-ldap/NGLdap/GNUmakefile
+--- sope.orig/sope-ldap/NGLdap/GNUmakefile 2007-06-11 09:00:10.000000000 -0600
++++ sope.gsmake2/sope-ldap/NGLdap/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -4,8 +4,6 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ include ./Version
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ ifneq ($(frameworks),yes)
+ LIBRARY_NAME = libNGLdap
+ else
+diff -Nur sope.orig/sope-mime/GNUmakefile sope.gsmake2/sope-mime/GNUmakefile
+--- sope.orig/sope-mime/GNUmakefile 2007-06-11 09:00:12.000000000 -0600
++++ sope.gsmake2/sope-mime/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -4,8 +4,6 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ include ./Version
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ ifneq ($(frameworks),yes)
+ LIBRARY_NAME = libNGMime
+ else
+diff -Nur sope.orig/sope-mime/NGMail/GNUmakefile sope.gsmake2/sope-mime/NGMail/GNUmakefile
+--- sope.orig/sope-mime/NGMail/GNUmakefile 2007-06-11 09:00:11.000000000 -0600
++++ sope.gsmake2/sope-mime/NGMail/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -3,8 +3,6 @@
+ -include ../../config.make
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
+-
+ ifneq ($(frameworks),yes)
+ SUBPROJECT_NAME = NGMail
+ else
+diff -Nur sope.orig/sope-xml/ChangeLogSaxDriver/GNUmakefile sope.gsmake2/sope-xml/ChangeLogSaxDriver/GNUmakefile
+--- sope.orig/sope-xml/ChangeLogSaxDriver/GNUmakefile 2007-06-11 09:00:46.000000000 -0600
++++ sope.gsmake2/sope-xml/ChangeLogSaxDriver/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -7,7 +7,7 @@
+
+ BUNDLE_NAME = ChangeLogSaxDriver
+ BUNDLE_EXTENSION = .sax
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ ChangeLogSaxDriver_OBJC_FILES = \
+ ChangeLogSaxDriver.m \
+diff -Nur sope.orig/sope-xml/libxmlSAXDriver/GNUmakefile sope.gsmake2/sope-xml/libxmlSAXDriver/GNUmakefile
+--- sope.orig/sope-xml/libxmlSAXDriver/GNUmakefile 2007-06-11 09:00:46.000000000 -0600
++++ sope.gsmake2/sope-xml/libxmlSAXDriver/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -7,7 +7,7 @@
+
+ BUNDLE_NAME = libxmlSAXDriver
+ BUNDLE_EXTENSION = .sax
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+ libxmlSAXDriver_PCH_FILE = common.h
+
+diff -Nur sope.orig/sope-xml/STXSaxDriver/GNUmakefile sope.gsmake2/sope-xml/STXSaxDriver/GNUmakefile
+--- sope.orig/sope-xml/STXSaxDriver/GNUmakefile 2007-06-11 09:00:48.000000000 -0600
++++ sope.gsmake2/sope-xml/STXSaxDriver/GNUmakefile 2008-03-31 21:33:44.000000000 -0600
+@@ -7,7 +7,7 @@
+
+ BUNDLE_NAME = STXSaxDriver
+ BUNDLE_EXTENSION = .sax
+-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
++BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/
+
+ STXSaxDriver_PCH_FILE = common.h
+
================================================================
Index: SOURCES/sope-crypt.patch
diff -u /dev/null SOURCES/sope-crypt.patch:1.1
--- /dev/null Wed Apr 2 16:52:17 2008
+++ SOURCES/sope-crypt.patch Wed Apr 2 16:52:12 2008
@@ -0,0 +1,26 @@
+diff -ur sope-orig/sope-appserver/SoOFS/GNUmakefile.preamble sope/sope-appserver/SoOFS/GNUmakefile.preamble
+--- sope-orig/sope-appserver/SoOFS/GNUmakefile.preamble 2007-06-11 09:00:50.000000000 -0600
++++ sope/sope-appserver/SoOFS/GNUmakefile.preamble 2008-03-30 14:59:17.000000000 -0600
+@@ -22,19 +22,19 @@
+ libSoOFS_LIBRARIES_DEPEND_UPON += \
+ -lNGObjWeb \
+ -lNGMime -lNGStreams -lNGExtensions -lEOControl \
+- -lXmlRpc -lDOM -lSaxObjC
++ -lXmlRpc -lDOM -lSaxObjC -lcrypt
+
+ $(SOPED_NAME)_TOOL_LIBS += \
+ -lSoOFS -lNGObjWeb \
+ -lNGMime -lNGStreams -lNGExtensions -lEOControl \
+- -lXmlRpc -lDOM -lSaxObjC
++ -lXmlRpc -lDOM -lSaxObjC -lcrypt
+
+ SoOFS_WOBUNDLE_LIBS += \
+ -lSoOFS \
+ -lNGObjWeb \
+ -lNGMime \
+ -lNGStreams -lNGExtensions -lEOControl \
+- -lXmlRpc -lDOM -lSaxObjC
++ -lXmlRpc -lDOM -lSaxObjC -lcrypt
+ SoOFS_BUNDLE_LIBS += $(SoOFS_WOBUNDLE_LIBS)
+
+ else
================================================================
Index: SOURCES/sope-_e_info.patch
diff -u /dev/null SOURCES/sope-_e_info.patch:1.1
--- /dev/null Wed Apr 2 16:52:17 2008
+++ SOURCES/sope-_e_info.patch Wed Apr 2 16:52:12 2008
@@ -0,0 +1,19 @@
+diff -ur sope-orig/sope-mime/NGImap4/NGImap4Client.m sope/sope-mime/NGImap4/NGImap4Client.m
+--- sope-orig/sope-mime/NGImap4/NGImap4Client.m 2007-06-11 09:00:10.000000000 -0600
++++ sope/sope-mime/NGImap4/NGImap4Client.m 2008-03-30 13:56:31.000000000 -0600
+@@ -54,11 +54,14 @@
+ @end /* NGImap4Client(ConnectionRegistration); */
+
+ #if GNUSTEP_BASE_LIBRARY
++
++#define _e_info(o) (((id*)o->_reserved)[0])
++
+ /* FIXME: TODO: move someplace better (hh: NGExtensions...) */
+ @implementation NSException(setUserInfo)
+
+ - (id)setUserInfo:(NSDictionary *)_userInfo {
+- ASSIGN(self->_e_info, _userInfo);
++ ASSIGN(_e_info(self), _userInfo);
+ return self;
+ }
+
================================================================
More information about the pld-cvs-commit
mailing list