diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-04 00:06:01 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-04 00:06:01 +0800 |
| commit | e1e94115f6db1374b9aac1d4ae40e0d32021cef9 (patch) | |
| tree | ada558550e1aa017814577d6bf5223d81614bef4 | |
| parent | cbcaa462d604f6def50e54f67ce4c935f20bda00 (diff) | |
| download | marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar.gz marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar.bz2 marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar.lz marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar.xz marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.tar.zst marcuscom-ports-e1e94115f6db1374b9aac1d4ae40e0d32021cef9.zip | |
Merge threading changes from FreeBSD CVS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@700 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-ag | 14 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in | 13 |
3 files changed, 25 insertions, 6 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 21892ac42..2011e341e 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ @@ -49,8 +49,6 @@ post-patch: xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ - ${WRKSRC}/po/Makefile.in.in pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index b0be15779..c4879a292 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002 -+++ gtk/Makefile.in Thu Dec 12 12:08:43 2002 -@@ -183,7 +183,7 @@ +--- gtk/Makefile.in.orig Sat May 3 02:43:20 2003 ++++ gtk/Makefile.in Sat May 3 02:46:30 2003 +@@ -175,7 +175,7 @@ -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ @@ -9,3 +9,11 @@ -DGTK_VERSION=\"@GTK_VERSION@\" \ -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ -DGTK_HOST=\"@host@\" \ +@@ -651,6 +651,7 @@ + TEST_DEPS = $(DEPS) gtk.immodules + + LDADDS = @STRIP_BEGIN@ \ ++ $(GLIB_LIBS) \ + $(gtktargetlib) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in new file mode 100644 index 000000000..fa3e1270f --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in @@ -0,0 +1,13 @@ +--- gdk-pixbuf/Makefile.in.orig Sat May 3 02:51:31 2003 ++++ gdk-pixbuf/Makefile.in Sat May 3 02:51:59 2003 +@@ -384,7 +384,9 @@ + + + AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" +-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la ++LDADDS = \ ++ $(GLIB_LIBS) \ ++ libgdk_pixbuf-$(GTK_API_VERSION).la + + noinst_PROGRAMS = test-gdk-pixbuf + test_gdk_pixbuf_LDADD = $(LDADDS) |