diff options
Diffstat (limited to 'devel/glib12/files/patch-ab')
| -rw-r--r-- | devel/glib12/files/patch-ab | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab index 22870a5b0d08..a081d01c420a 100644 --- a/devel/glib12/files/patch-ab +++ b/devel/glib12/files/patch-ab @@ -1,13 +1,13 @@ ---- Makefile.in.orig Thu Dec 17 13:11:36 1998 -+++ Makefile.in Sat Dec 26 22:58:19 1998 +--- Makefile.in.orig Mon Jan 4 17:47:12 1999 ++++ Makefile.in Tue Jan 5 06:37:12 1999 @@ -87,14 +87,12 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ --SUBDIRS = gmodule gthread docs +-SUBDIRS = gmodule gthread docs tests +SUBDIRS = gmodule gthread # alpha `automake' supports this better - #SUBDIRS = . gmodule docs + #SUBDIRS = . gmodule gthread docs tests -configincludedir = $(pkglibdir)/include - @@ -18,8 +18,8 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -@@ -108,9 +106,9 @@ - makefile.msc \ +@@ -109,9 +107,9 @@ + makefile.msc \ glibconfig.h.win32 -lib_LTLIBRARIES = libglib.la @@ -27,25 +27,26 @@ -libglib_la_SOURCES = \ +libglib11d_la_SOURCES = \ - garray.c \ - gcache.c \ - gcompletion.c \ -@@ -138,27 +136,25 @@ - gmutex.c + garray.c \ + gcache.c \ + gcompletion.c \ +@@ -139,28 +137,25 @@ + gutils.c include_HEADERS = \ -- glib.h +- glib.h - -configinclude_DATA = \ -+ glib.h \ - glibconfig.h ++ glib.h \ + glibconfig.h BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -libglib_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 2:0:0 ++ -version-info 2:1:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -65,7 +66,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -166,8 +162,8 @@ +@@ -168,8 +163,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -73,10 +74,10 @@ -libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ +libglib11d_la_LIBADD = +libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ - gdate.lo gerror.lo ghash.lo ghook.lo glist.lo gmain.lo giochannel.lo \ - giounix.lo gmem.lo gmessages.lo gnode.lo gprimes.lo gslist.lo gtimer.lo \ - gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo \ -@@ -176,15 +172,15 @@ + gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \ + gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ + gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ +@@ -178,15 +173,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o @@ -95,7 +96,7 @@ testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -192,7 +188,7 @@ +@@ -194,7 +189,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ @@ -104,7 +105,7 @@ HEADERS = $(include_HEADERS) -@@ -206,8 +202,8 @@ +@@ -208,8 +203,8 @@ TAR = tar GZIP = --best @@ -115,7 +116,7 @@ all: all-recursive-am all-am -@@ -248,7 +244,10 @@ +@@ -250,7 +245,10 @@ -rm -f config.h maintainer-clean-hdr: @@ -127,7 +128,7 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status mostlyclean-libLTLIBRARIES: -@@ -314,8 +313,8 @@ +@@ -316,8 +314,8 @@ maintainer-clean-libtool: @@ -138,7 +139,7 @@ mostlyclean-noinstPROGRAMS: -@@ -357,44 +356,6 @@ +@@ -359,44 +357,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -183,7 +184,7 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) -@@ -534,13 +495,13 @@ +@@ -536,13 +496,13 @@ all-recursive-am: config.h $(MAKE) all-recursive @@ -200,7 +201,7 @@ install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) -@@ -616,8 +577,7 @@ +@@ -618,8 +578,7 @@ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ @@ -210,8 +211,8 @@ install-includeHEADERS install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ ---- gmodule/Makefile.in.orig Thu Dec 17 13:11:37 1998 -+++ gmodule/Makefile.in Sat Dec 26 22:51:58 1998 +--- gmodule/Makefile.in.orig Mon Jan 4 17:47:13 1999 ++++ gmodule/Makefile.in Tue Jan 5 06:37:37 1999 @@ -101,30 +101,29 @@ include_HEADERS = \ gmodule.h @@ -229,7 +230,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 2:0:0 ++ -version-info 2:1:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -330,8 +331,8 @@ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ ---- gthread/Makefile.in.orig Thu Dec 17 13:11:39 1998 -+++ gthread/Makefile.in Sat Dec 26 22:51:58 1998 +--- gthread/Makefile.in.orig Mon Jan 4 17:47:15 1999 ++++ gthread/Makefile.in Tue Jan 5 06:37:46 1999 @@ -93,19 +93,18 @@ gthread-nspr.c \ gthread-none.c @@ -348,7 +349,7 @@ - -release $(LT_RELEASE) +libgthread11d_la_SOURCES = gthread.c +libgthread11d_la_LDFLAGS = \ -+ -version-info 2:0:0 ++ -version-info 2:1:0 -libgthread_la_LIBADD = @G_THREAD_LIBS@ +libgthread11d_la_LIBADD = @G_THREAD_LIBS@ |