| 1 |
commit: a3f3569b1de3a29b783fe220d66f5b2ab44e12ff |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Thu Feb 28 10:37:03 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Thu Feb 28 10:37:03 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a3f3569b |
| 7 |
|
| 8 |
dev-libs/glib: Add 2.35.8 to overlay |
| 9 |
|
| 10 |
--- |
| 11 |
.../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 ------------ |
| 12 |
...ch => glib-2.35.x-external-gdbus-codegen.patch} | 64 ++++++++++++-------- |
| 13 |
.../glib/{glib-9999.ebuild => glib-2.35.8.ebuild} | 11 +++- |
| 14 |
dev-libs/glib/glib-9999.ebuild | 11 +++- |
| 15 |
4 files changed, 59 insertions(+), 66 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 0859e33..0000000 |
| 20 |
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,39 +0,0 @@ |
| 23 |
-From Debian, this one is needed for gcc < 4.1... |
| 24 |
- |
| 25 |
---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000 |
| 26 |
-+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000 |
| 27 |
-@@ -414,14 +414,14 @@ |
| 28 |
- g_atomic_int_exchange_and_add (volatile gint *atomic, |
| 29 |
- gint val) |
| 30 |
- { |
| 31 |
-- return __sync_fetch_and_add (atomic, val); |
| 32 |
-+ return __sync_fetch_and_add_si (atomic, val); |
| 33 |
- } |
| 34 |
- |
| 35 |
- void |
| 36 |
- g_atomic_int_add (volatile gint *atomic, |
| 37 |
- gint val) |
| 38 |
- { |
| 39 |
-- __sync_fetch_and_add (atomic, val); |
| 40 |
-+ __sync_fetch_and_add_si (atomic, val); |
| 41 |
- } |
| 42 |
- |
| 43 |
- gboolean |
| 44 |
-@@ -429,7 +429,7 @@ |
| 45 |
- gint oldval, |
| 46 |
- gint newval) |
| 47 |
- { |
| 48 |
-- return __sync_bool_compare_and_swap (atomic, oldval, newval); |
| 49 |
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); |
| 50 |
- } |
| 51 |
- |
| 52 |
- gboolean |
| 53 |
-@@ -437,7 +437,7 @@ |
| 54 |
- gpointer oldval, |
| 55 |
- gpointer newval) |
| 56 |
- { |
| 57 |
-- return __sync_bool_compare_and_swap ((long *)atomic, |
| 58 |
-+ return __sync_bool_compare_and_swap_di ((long *)atomic, |
| 59 |
- (long)oldval, (long)newval); |
| 60 |
- } |
| 61 |
- |
| 62 |
|
| 63 |
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch |
| 64 |
similarity index 54% |
| 65 |
rename from dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch |
| 66 |
rename to dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch |
| 67 |
index bd3afee..a7fb019 100644 |
| 68 |
--- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch |
| 69 |
+++ b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch |
| 70 |
@@ -1,42 +1,56 @@ |
| 71 |
-From 457ac2926e754bbebd72ee3606ad405ccfd2e952 Mon Sep 17 00:00:00 2001 |
| 72 |
+From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001 |
| 73 |
From: Priit Laes <plaes@×××××.org> |
| 74 |
-Date: Fri, 3 Feb 2012 09:08:28 +0200 |
| 75 |
+Date: Thu, 28 Feb 2013 08:28:01 +0200 |
| 76 |
Subject: [PATCH] Split out gdbus codegen |
| 77 |
|
| 78 |
--- |
| 79 |
- configure.ac | 3 +-- |
| 80 |
- docs/reference/gio/Makefile.am | 3 +-- |
| 81 |
- gio/Makefile.am | 2 +- |
| 82 |
- gio/tests/Makefile.am | 6 ++---- |
| 83 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
| 84 |
- 5 files changed, 7 insertions(+), 13 deletions(-) |
| 85 |
+ configure.ac | 17 ++++++++--------- |
| 86 |
+ docs/reference/gio/Makefile.am | 3 +-- |
| 87 |
+ gio/Makefile.am | 2 +- |
| 88 |
+ gio/tests/Makefile.am | 6 ++---- |
| 89 |
+ gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
| 90 |
+ 5 files changed, 14 insertions(+), 20 deletions(-) |
| 91 |
|
| 92 |
diff --git a/configure.ac b/configure.ac |
| 93 |
-index 833891b..697ce60 100644 |
| 94 |
+index f734b7c..8076e7f 100644 |
| 95 |
--- a/configure.ac |
| 96 |
+++ b/configure.ac |
| 97 |
-@@ -380,7 +380,7 @@ fi |
| 98 |
- AC_SUBST(PERL_PATH) |
| 99 |
- |
| 100 |
- # Need suitable python path for greport |
| 101 |
+@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH) |
| 102 |
+ # option to specify python interpreter to use; this just sets $PYTHON, so that |
| 103 |
+ # we will fallback to reading $PYTHON if --with-python is not given, and |
| 104 |
+ # python.m4 will get the expected input |
| 105 |
+-AC_ARG_WITH(python, |
| 106 |
+- AS_HELP_STRING([--with-python=PATH], |
| 107 |
+- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| 108 |
+- [PYTHON="$withval"], []) |
| 109 |
+-if test x"$PYTHON" = xyes; then |
| 110 |
+- AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| 111 |
+-fi |
| 112 |
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| 113 |
++# AC_ARG_WITH(python, |
| 114 |
++# AS_HELP_STRING([--with-python=PATH], |
| 115 |
++# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| 116 |
++# [PYTHON="$withval"], []) |
| 117 |
++# if test x"$PYTHON" = xyes; then |
| 118 |
++# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| 119 |
++# fi |
| 120 |
+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| 121 |
|
| 122 |
|
| 123 |
dnl *********************** |
| 124 |
-@@ -3561,7 +3561,6 @@ gobject/glib-mkenums |
| 125 |
+@@ -3697,7 +3697,6 @@ gobject/glib-mkenums |
| 126 |
gobject/tests/Makefile |
| 127 |
gthread/Makefile |
| 128 |
gio/Makefile |
| 129 |
-gio/gdbus-2.0/codegen/Makefile |
| 130 |
gio/gdbus-2.0/codegen/config.py |
| 131 |
+ gio/gnetworking.h |
| 132 |
gio/xdgmime/Makefile |
| 133 |
- gio/inotify/Makefile |
| 134 |
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
| 135 |
-index 7d2d264..7cac0b2 100644 |
| 136 |
+index 99606d3..067cd50 100644 |
| 137 |
--- a/docs/reference/gio/Makefile.am |
| 138 |
+++ b/docs/reference/gio/Makefile.am |
| 139 |
-@@ -148,8 +148,7 @@ man_MANS = \ |
| 140 |
+@@ -152,8 +152,7 @@ man_MANS += \ |
| 141 |
glib-compile-resources.1 \ |
| 142 |
gsettings.1 \ |
| 143 |
gresource.1 \ |
| 144 |
@@ -44,10 +58,10 @@ index 7d2d264..7cac0b2 100644 |
| 145 |
- gdbus-codegen.1 |
| 146 |
+ gdbus.1 |
| 147 |
|
| 148 |
- if ENABLE_MAN |
| 149 |
- |
| 150 |
+ XSLTPROC_FLAGS = \ |
| 151 |
+ --nonet \ |
| 152 |
diff --git a/gio/Makefile.am b/gio/Makefile.am |
| 153 |
-index dae04b4..835ccc7 100644 |
| 154 |
+index 94d7f59..c07d00d 100644 |
| 155 |
--- a/gio/Makefile.am |
| 156 |
+++ b/gio/Makefile.am |
| 157 |
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl |
| 158 |
@@ -60,11 +74,11 @@ index dae04b4..835ccc7 100644 |
| 159 |
if OS_UNIX |
| 160 |
SUBDIRS += xdgmime |
| 161 |
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
| 162 |
-index c5cf59d..be9e48c 100644 |
| 163 |
+index c8a4090..feece02 100644 |
| 164 |
--- a/gio/tests/Makefile.am |
| 165 |
+++ b/gio/tests/Makefile.am |
| 166 |
-@@ -293,10 +293,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses |
| 167 |
- gdbus_close_pending_LDADD = $(progs_ldadd) |
| 168 |
+@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h |
| 169 |
+ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c |
| 170 |
|
| 171 |
if OS_UNIX |
| 172 |
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
| 173 |
@@ -77,7 +91,7 @@ index c5cf59d..be9e48c 100644 |
| 174 |
--generate-c-code gdbus-test-codegen-generated \ |
| 175 |
--c-generate-object-manager \ |
| 176 |
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
| 177 |
-index 9861d0e..9ca6eb9 100644 |
| 178 |
+index 6875210..264c3c1 100644 |
| 179 |
--- a/gio/tests/gdbus-object-manager-example/Makefile.am |
| 180 |
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
| 181 |
@@ -21,10 +21,8 @@ GDBUS_GENERATED = \ |
| 182 |
@@ -94,5 +108,5 @@ index 9861d0e..9ca6eb9 100644 |
| 183 |
--c-namespace Example \ |
| 184 |
--c-generate-object-manager \ |
| 185 |
-- |
| 186 |
-1.7.8.6 |
| 187 |
+1.8.1.2 |
| 188 |
|
| 189 |
|
| 190 |
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.35.8.ebuild |
| 191 |
similarity index 94% |
| 192 |
copy from dev-libs/glib/glib-9999.ebuild |
| 193 |
copy to dev-libs/glib/glib-2.35.8.ebuild |
| 194 |
index f55ba9c..1d7a2ae 100644 |
| 195 |
--- a/dev-libs/glib/glib-9999.ebuild |
| 196 |
+++ b/dev-libs/glib/glib-2.35.8.ebuild |
| 197 |
@@ -100,6 +100,13 @@ src_prepare() { |
| 198 |
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
| 199 |
fi |
| 200 |
|
| 201 |
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any |
| 202 |
+ # other), falling back to xterm if one doesn't exist |
| 203 |
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
| 204 |
+ ewarn "Some tests will be skipped due to missing terminal program" |
| 205 |
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
| 206 |
+ fi |
| 207 |
+ |
| 208 |
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 |
| 209 |
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then |
| 210 |
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" |
| 211 |
@@ -114,10 +121,12 @@ src_prepare() { |
| 212 |
# needed to prevent gdbus-threading from asserting |
| 213 |
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py |
| 214 |
fi |
| 215 |
+ |
| 216 |
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" |
| 217 |
fi |
| 218 |
|
| 219 |
# gdbus-codegen is a separate package |
| 220 |
- epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" |
| 221 |
+ epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch" |
| 222 |
|
| 223 |
# bashcomp goes in /usr/share/bash-completion |
| 224 |
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" |
| 225 |
|
| 226 |
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild |
| 227 |
index f55ba9c..1d7a2ae 100644 |
| 228 |
--- a/dev-libs/glib/glib-9999.ebuild |
| 229 |
+++ b/dev-libs/glib/glib-9999.ebuild |
| 230 |
@@ -100,6 +100,13 @@ src_prepare() { |
| 231 |
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
| 232 |
fi |
| 233 |
|
| 234 |
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any |
| 235 |
+ # other), falling back to xterm if one doesn't exist |
| 236 |
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
| 237 |
+ ewarn "Some tests will be skipped due to missing terminal program" |
| 238 |
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
| 239 |
+ fi |
| 240 |
+ |
| 241 |
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 |
| 242 |
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then |
| 243 |
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" |
| 244 |
@@ -114,10 +121,12 @@ src_prepare() { |
| 245 |
# needed to prevent gdbus-threading from asserting |
| 246 |
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py |
| 247 |
fi |
| 248 |
+ |
| 249 |
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" |
| 250 |
fi |
| 251 |
|
| 252 |
# gdbus-codegen is a separate package |
| 253 |
- epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" |
| 254 |
+ epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch" |
| 255 |
|
| 256 |
# bashcomp goes in /usr/share/bash-completion |
| 257 |
epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" |
Archives