| 1 |
commit: a739ce237bf15fd7d9e35a30fd6679f9aa5ea27a |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 29 00:02:58 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 29 00:06:45 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a739ce23 |
| 7 |
|
| 8 |
x11-libs/pango: 1.30.1 → 1.32.1 |
| 9 |
|
| 10 |
Refresh multilib patch and make it non conditional like gtk2. |
| 11 |
harfbuzz is a hard requirement now. |
| 12 |
|
| 13 |
--- |
| 14 |
x11-libs/pango/files/pango-1.26.0-lib64.patch | 20 ------- |
| 15 |
x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 ++++++++++++++++ |
| 16 |
.../{pango-9999.ebuild => pango-1.32.1.ebuild} | 54 ++++++------------- |
| 17 |
x11-libs/pango/pango-9999.ebuild | 54 ++++++------------- |
| 18 |
4 files changed, 78 insertions(+), 94 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-libs/pango/files/pango-1.26.0-lib64.patch b/x11-libs/pango/files/pango-1.26.0-lib64.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index cdbdd50..0000000 |
| 23 |
--- a/x11-libs/pango/files/pango-1.26.0-lib64.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,20 +0,0 @@ |
| 26 |
---- pango/Makefile.am |
| 27 |
-+++ pango/Makefile.am |
| 28 |
-@@ -16,6 +16,7 @@ |
| 29 |
- -DPANGO_ENABLE_BACKEND \ |
| 30 |
- -DPANGO_ENABLE_ENGINE \ |
| 31 |
- -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 32 |
-+ -DHOST=\"$(host_triplet)\" \ |
| 33 |
- -DLIBDIR=\"$(libdir)\" \ |
| 34 |
- -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ |
| 35 |
- -DG_DISABLE_DEPRECATED \ |
| 36 |
---- pango/modules.c |
| 37 |
-+++ pango/modules.c |
| 38 |
-@@ -353,6 +353,7 @@ |
| 39 |
- |
| 40 |
- if (!file_str) |
| 41 |
- file_str = g_build_filename (pango_get_sysconf_subdirectory (), |
| 42 |
-+ HOST, |
| 43 |
- "pango.modules", |
| 44 |
- NULL); |
| 45 |
- |
| 46 |
|
| 47 |
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..0820c78 |
| 50 |
--- /dev/null |
| 51 |
+++ b/x11-libs/pango/files/pango-1.32.1-lib64.patch |
| 52 |
@@ -0,0 +1,44 @@ |
| 53 |
+From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001 |
| 54 |
+From: Gilles Dartiguelongue <eva@g.o> |
| 55 |
+Date: Sun, 28 Oct 2012 23:19:39 +0100 |
| 56 |
+Subject: [PATCH] Add multilib support |
| 57 |
+ |
| 58 |
+pango.modules list modules specific to a host architecture. |
| 59 |
+Add host triplet in path so that machine able to run multiple |
| 60 |
+triplet have a proper file per pango library. |
| 61 |
+--- |
| 62 |
+ pango/Makefile.am | 1 + |
| 63 |
+ pango/pango-utils.c | 4 ++-- |
| 64 |
+ 2 files changed, 3 insertions(+), 2 deletions(-) |
| 65 |
+ |
| 66 |
+diff --git a/pango/Makefile.am b/pango/Makefile.am |
| 67 |
+index ab092c9..558108b 100644 |
| 68 |
+--- a/pango/Makefile.am |
| 69 |
++++ b/pango/Makefile.am |
| 70 |
+@@ -17,6 +17,7 @@ INCLUDES = \ |
| 71 |
+ -DPANGO_ENABLE_BACKEND \ |
| 72 |
+ -DPANGO_ENABLE_ENGINE \ |
| 73 |
+ -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 74 |
++ -DHOST=\"$(host_triplet)\" \ |
| 75 |
+ -DLIBDIR=\"$(libdir)\" \ |
| 76 |
+ -I$(top_srcdir) \ |
| 77 |
+ -I$(top_builddir) \ |
| 78 |
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c |
| 79 |
+index 18ffa26..3b88f15 100644 |
| 80 |
+--- a/pango/pango-utils.c |
| 81 |
++++ b/pango/pango-utils.c |
| 82 |
+@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void) |
| 83 |
+ #else |
| 84 |
+ const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR"); |
| 85 |
+ if (sysconfdir != NULL) |
| 86 |
+- tmp_result = g_build_filename (sysconfdir, "pango", NULL); |
| 87 |
++ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL); |
| 88 |
+ else |
| 89 |
+- tmp_result = SYSCONFDIR "/pango"; |
| 90 |
++ tmp_result = SYSCONFDIR "/pango/" HOST; |
| 91 |
+ #endif |
| 92 |
+ g_once_init_leave((gsize*)&result, (gsize)tmp_result); |
| 93 |
+ } |
| 94 |
+-- |
| 95 |
+1.7.12.4 |
| 96 |
+ |
| 97 |
|
| 98 |
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-1.32.1.ebuild |
| 99 |
similarity index 65% |
| 100 |
copy from x11-libs/pango/pango-9999.ebuild |
| 101 |
copy to x11-libs/pango/pango-1.32.1.ebuild |
| 102 |
index d2744f3..bb4bb93 100644 |
| 103 |
--- a/x11-libs/pango/pango-9999.ebuild |
| 104 |
+++ b/x11-libs/pango/pango-1.32.1.ebuild |
| 105 |
@@ -14,7 +14,7 @@ fi |
| 106 |
DESCRIPTION="Internationalized text layout and rendering library" |
| 107 |
HOMEPAGE="http://www.pango.org/" |
| 108 |
|
| 109 |
-LICENSE="LGPL-2 FTL" |
| 110 |
+LICENSE="LGPL-2+ FTL" |
| 111 |
SLOT="0" |
| 112 |
if [[ ${PV} = 9999 ]]; then |
| 113 |
KEYWORDS="" |
| 114 |
@@ -22,12 +22,11 @@ else |
| 115 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 116 |
fi |
| 117 |
|
| 118 |
-IUSE="X doc +introspection test" |
| 119 |
+IUSE="X +introspection" |
| 120 |
|
| 121 |
-# Upstream bug #643802 |
| 122 |
-REQUIRED_USE="doc? ( X )" |
| 123 |
- |
| 124 |
-RDEPEND=">=dev-libs/glib-2.31.0:2 |
| 125 |
+RDEPEND=" |
| 126 |
+ >=media-libs/harfbuzz-0.9.3 |
| 127 |
+ >=dev-libs/glib-2.33.12:2 |
| 128 |
>=media-libs/fontconfig-2.5.0:1.0 |
| 129 |
media-libs/freetype:2 |
| 130 |
>=x11-libs/cairo-1.7.6[X?] |
| 131 |
@@ -36,42 +35,23 @@ RDEPEND=">=dev-libs/glib-2.31.0:2 |
| 132 |
x11-libs/libX11 |
| 133 |
>=x11-libs/libXft-2.0.0 )" |
| 134 |
DEPEND="${RDEPEND} |
| 135 |
- virtual/pkgconfig |
| 136 |
>=dev-util/gtk-doc-am-1.13 |
| 137 |
- doc? ( |
| 138 |
- >=dev-util/gtk-doc-1.13 |
| 139 |
- ~app-text/docbook-xml-dtd-4.1.2 |
| 140 |
- x11-libs/libXft ) |
| 141 |
+ virtual/pkgconfig |
| 142 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
| 143 |
- test? ( |
| 144 |
- >=dev-util/gtk-doc-1.13 |
| 145 |
- ~app-text/docbook-xml-dtd-4.1.2 |
| 146 |
- x11-libs/libXft ) |
| 147 |
X? ( x11-proto/xproto ) |
| 148 |
!<=sys-devel/autoconf-2.63:2.5" |
| 149 |
|
| 150 |
-function multilib_enabled() { |
| 151 |
- has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) |
| 152 |
-} |
| 153 |
- |
| 154 |
-pkg_setup() { |
| 155 |
+src_prepare() { |
| 156 |
tc-export CXX |
| 157 |
+ DOCS="AUTHORS ChangeLog* NEWS README THANKS" |
| 158 |
G2CONF="${G2CONF} |
| 159 |
$(use_enable introspection) |
| 160 |
- $(use_with X x) |
| 161 |
+ $(use_with X xft) |
| 162 |
$(use X && echo --x-includes=${EPREFIX}/usr/include) |
| 163 |
$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))" |
| 164 |
- DOCS="AUTHORS ChangeLog* NEWS README THANKS" |
| 165 |
-} |
| 166 |
|
| 167 |
-src_prepare() { |
| 168 |
- # make config file location host specific so that a 32bit and 64bit pango |
| 169 |
- # wont fight with each other on a multilib system. Fix building for |
| 170 |
- # emul-linux-x86-gtklibs |
| 171 |
- if multilib_enabled ; then |
| 172 |
- epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch" |
| 173 |
- eautoreconf |
| 174 |
- fi |
| 175 |
+ epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" |
| 176 |
+ eautoreconf |
| 177 |
|
| 178 |
gnome2_src_prepare |
| 179 |
} |
| 180 |
@@ -79,16 +59,16 @@ src_prepare() { |
| 181 |
pkg_postinst() { |
| 182 |
einfo "Generating modules listing..." |
| 183 |
|
| 184 |
- local PANGO_CONFDIR="${EROOT}/etc/pango" |
| 185 |
- multilib_enabled && PANGO_CONFDIR+="/${CHOST}" |
| 186 |
- |
| 187 |
- mkdir -p "${PANGO_CONFDIR}" |
| 188 |
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" |
| 189 |
local pango_conf="${PANGO_CONFDIR}/pango.modules" |
| 190 |
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) |
| 191 |
+ local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) |
| 192 |
+ |
| 193 |
+ dodir "${PANGO_CONFDIR}" |
| 194 |
+ keepdir "${PANGO_CONFDIR}" |
| 195 |
|
| 196 |
# be atomic! |
| 197 |
if pango-querymodules --system \ |
| 198 |
- "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ |
| 199 |
+ "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \ |
| 200 |
> "${tmp_file}"; then |
| 201 |
cat "${tmp_file}" > "${pango_conf}" || { |
| 202 |
rm "${tmp_file}"; die; } |
| 203 |
|
| 204 |
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild |
| 205 |
index d2744f3..bb4bb93 100644 |
| 206 |
--- a/x11-libs/pango/pango-9999.ebuild |
| 207 |
+++ b/x11-libs/pango/pango-9999.ebuild |
| 208 |
@@ -14,7 +14,7 @@ fi |
| 209 |
DESCRIPTION="Internationalized text layout and rendering library" |
| 210 |
HOMEPAGE="http://www.pango.org/" |
| 211 |
|
| 212 |
-LICENSE="LGPL-2 FTL" |
| 213 |
+LICENSE="LGPL-2+ FTL" |
| 214 |
SLOT="0" |
| 215 |
if [[ ${PV} = 9999 ]]; then |
| 216 |
KEYWORDS="" |
| 217 |
@@ -22,12 +22,11 @@ else |
| 218 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 219 |
fi |
| 220 |
|
| 221 |
-IUSE="X doc +introspection test" |
| 222 |
+IUSE="X +introspection" |
| 223 |
|
| 224 |
-# Upstream bug #643802 |
| 225 |
-REQUIRED_USE="doc? ( X )" |
| 226 |
- |
| 227 |
-RDEPEND=">=dev-libs/glib-2.31.0:2 |
| 228 |
+RDEPEND=" |
| 229 |
+ >=media-libs/harfbuzz-0.9.3 |
| 230 |
+ >=dev-libs/glib-2.33.12:2 |
| 231 |
>=media-libs/fontconfig-2.5.0:1.0 |
| 232 |
media-libs/freetype:2 |
| 233 |
>=x11-libs/cairo-1.7.6[X?] |
| 234 |
@@ -36,42 +35,23 @@ RDEPEND=">=dev-libs/glib-2.31.0:2 |
| 235 |
x11-libs/libX11 |
| 236 |
>=x11-libs/libXft-2.0.0 )" |
| 237 |
DEPEND="${RDEPEND} |
| 238 |
- virtual/pkgconfig |
| 239 |
>=dev-util/gtk-doc-am-1.13 |
| 240 |
- doc? ( |
| 241 |
- >=dev-util/gtk-doc-1.13 |
| 242 |
- ~app-text/docbook-xml-dtd-4.1.2 |
| 243 |
- x11-libs/libXft ) |
| 244 |
+ virtual/pkgconfig |
| 245 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
| 246 |
- test? ( |
| 247 |
- >=dev-util/gtk-doc-1.13 |
| 248 |
- ~app-text/docbook-xml-dtd-4.1.2 |
| 249 |
- x11-libs/libXft ) |
| 250 |
X? ( x11-proto/xproto ) |
| 251 |
!<=sys-devel/autoconf-2.63:2.5" |
| 252 |
|
| 253 |
-function multilib_enabled() { |
| 254 |
- has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) |
| 255 |
-} |
| 256 |
- |
| 257 |
-pkg_setup() { |
| 258 |
+src_prepare() { |
| 259 |
tc-export CXX |
| 260 |
+ DOCS="AUTHORS ChangeLog* NEWS README THANKS" |
| 261 |
G2CONF="${G2CONF} |
| 262 |
$(use_enable introspection) |
| 263 |
- $(use_with X x) |
| 264 |
+ $(use_with X xft) |
| 265 |
$(use X && echo --x-includes=${EPREFIX}/usr/include) |
| 266 |
$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))" |
| 267 |
- DOCS="AUTHORS ChangeLog* NEWS README THANKS" |
| 268 |
-} |
| 269 |
|
| 270 |
-src_prepare() { |
| 271 |
- # make config file location host specific so that a 32bit and 64bit pango |
| 272 |
- # wont fight with each other on a multilib system. Fix building for |
| 273 |
- # emul-linux-x86-gtklibs |
| 274 |
- if multilib_enabled ; then |
| 275 |
- epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch" |
| 276 |
- eautoreconf |
| 277 |
- fi |
| 278 |
+ epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" |
| 279 |
+ eautoreconf |
| 280 |
|
| 281 |
gnome2_src_prepare |
| 282 |
} |
| 283 |
@@ -79,16 +59,16 @@ src_prepare() { |
| 284 |
pkg_postinst() { |
| 285 |
einfo "Generating modules listing..." |
| 286 |
|
| 287 |
- local PANGO_CONFDIR="${EROOT}/etc/pango" |
| 288 |
- multilib_enabled && PANGO_CONFDIR+="/${CHOST}" |
| 289 |
- |
| 290 |
- mkdir -p "${PANGO_CONFDIR}" |
| 291 |
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" |
| 292 |
local pango_conf="${PANGO_CONFDIR}/pango.modules" |
| 293 |
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) |
| 294 |
+ local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) |
| 295 |
+ |
| 296 |
+ dodir "${PANGO_CONFDIR}" |
| 297 |
+ keepdir "${PANGO_CONFDIR}" |
| 298 |
|
| 299 |
# be atomic! |
| 300 |
if pango-querymodules --system \ |
| 301 |
- "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ |
| 302 |
+ "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \ |
| 303 |
> "${tmp_file}"; then |
| 304 |
cat "${tmp_file}" > "${pango_conf}" || { |
| 305 |
rm "${tmp_file}"; die; } |
Archives