diff options
| author | jmmv <jmmv@pkgsrc.org> | 2012-05-22 20:40:07 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2012-05-22 20:40:07 +0000 |
| commit | 5cd6f708697222867c7b901ec259786e3cd91d83 (patch) | |
| tree | 793cdc6aecabfc11a7eccc18fedfa0432c4d005c /devel/glib2/patches | |
| parent | af308a56b974d1f4f5d068846fa7d80f0de84fa4 (diff) | |
| download | pkgsrc-5cd6f708697222867c7b901ec259786e3cd91d83.tar.gz | |
Fix kqueue support by using patch for 2.32.2 and correcting some problems
that we had in our own patches for the Makefile.am files.
Bump PKGREVISION to 1.
Diffstat (limited to 'devel/glib2/patches')
| -rw-r--r-- | devel/glib2/patches/patch-as | 24 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-cl | 10 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-co | 13 |
3 files changed, 38 insertions, 9 deletions
diff --git a/devel/glib2/patches/patch-as b/devel/glib2/patches/patch-as index 9daeee053d9..6a574b6f31d 100644 --- a/devel/glib2/patches/patch-as +++ b/devel/glib2/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.2 2012/04/30 13:53:48 drochner Exp $ +$NetBSD: patch-as,v 1.3 2012/05/22 20:40:08 jmmv Exp $ avoid python dependency ---- gio/tests/Makefile.am.orig 2012-03-21 02:24:32.000000000 +0000 +--- gio/tests/Makefile.am.orig 2012-05-01 00:06:39.000000000 +0000 +++ gio/tests/Makefile.am @@ -4,7 +4,7 @@ BUILT_SOURCES = @@ -13,7 +13,23 @@ avoid python dependency INCLUDES = \ -g \ -@@ -123,12 +123,9 @@ TEST_PROGS += \ +@@ -77,7 +77,6 @@ TEST_PROGS += \ + gdbus-threading \ + gdbus-export \ + gdbus-error \ +- gdbus-peer \ + gdbus-exit-on-close \ + gdbus-non-socket \ + gdbus-bz627724 \ +@@ -103,7 +102,6 @@ SAMPLE_PROGS = \ + gdbus-example-watch-proxy \ + gdbus-example-server \ + gdbus-example-subtree \ +- gdbus-example-peer \ + gdbus-example-proxy-subclass \ + gdbus-connection-flush-helper \ + appinfo-test \ +@@ -123,12 +121,9 @@ TEST_PROGS += \ unix-streams \ gapplication \ basic-application \ @@ -26,7 +42,7 @@ avoid python dependency $(NULL) endif -@@ -295,7 +292,7 @@ gdbus-test-codegen-generated.h gdbus-tes +@@ -295,7 +290,7 @@ gdbus-test-codegen-generated.h gdbus-tes $(srcdir)/test-codegen.xml \ $(NULL) diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl index dce45235902..de79eea2016 100644 --- a/devel/glib2/patches/patch-cl +++ b/devel/glib2/patches/patch-cl @@ -1,17 +1,17 @@ -$NetBSD: patch-cl,v 1.6 2012/05/01 18:45:53 adam Exp $ +$NetBSD: patch-cl,v 1.7 2012/05/22 20:40:08 jmmv Exp $ --- gio/Makefile.am.orig 2012-05-01 00:08:03.000000000 +0000 +++ gio/Makefile.am -@@ -2,8 +2,6 @@ include $(top_srcdir)/Makefile.decl +@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL = -SUBDIRS = gdbus-2.0/codegen -- ++SUBDIRS = + if OS_UNIX SUBDIRS += xdgmime - endif -@@ -715,13 +713,6 @@ gdbus_LDADD = libgio-2.0.la \ +@@ -715,13 +715,6 @@ gdbus_LDADD = libgio-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la diff --git a/devel/glib2/patches/patch-co b/devel/glib2/patches/patch-co new file mode 100644 index 00000000000..2fd36a88601 --- /dev/null +++ b/devel/glib2/patches/patch-co @@ -0,0 +1,13 @@ +$NetBSD: patch-co,v 1.1 2012/05/22 20:40:08 jmmv Exp $ + +--- glib/Makefile.am.orig 2012-05-01 00:06:39.000000000 +0000 ++++ glib/Makefile.am +@@ -82,7 +82,7 @@ EXTRA_DIST += \ + gconstructor.h \ + $(MIRRORING_TAB_SOURCE) + +-CLEANFILES= libglib-gdb.py ++CLEANFILES += libglib-gdb.py + + # These may be in the builddir too + BUILT_EXTRA_DIST = \ |