* [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
@ 2013-06-06 5:09 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2013-06-06 5:09 UTC (permalink / raw
To: gentoo-commits
tetromino 13/06/06 05:09:38
Added: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
Log:
Fix linking failure with harfbuzz-0.9.18, and add a subslot dependency to allow for automatic rebuilding when 0.9.18-rX is subslotted.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.1 net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.1&content-type=text/plain
Index: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
===================================================================
2013-05-30 Alberto Garcia <agarcia@igalia.com>
[GTK] Needs to check for harfbuzz-icu
https://bugs.webkit.org/show_bug.cgi?id=116978
Reviewed by Xan Lopez.
HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
also need to check for it in order to get the necessary flags for
the compiler and the linker.
We keep this conditional for now since we still want to support
earlier versions of HarfBuzz.
* Source/autotools/FindDependencies.m4:
Index: /trunk/Source/autotools/FindDependencies.m4
===================================================================
--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
@@ -376,4 +376,11 @@
[cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
fi
+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
+# Since we support earlier HarfBuzz versions we keep this conditional for now.
+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
+fi
AC_SUBST([FREETYPE_CFLAGS])
AC_SUBST([FREETYPE_LIBS])
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
@ 2013-06-06 5:12 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2013-06-06 5:12 UTC (permalink / raw
To: gentoo-commits
tetromino 13/06/06 05:12:24
Modified: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
Log:
Avoid CRLF line endings in patch.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.2 net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch?r1=1.1&r2=1.2
Index: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 6 Jun 2013 05:09:38 -0000 1.1
+++ webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 6 Jun 2013 05:12:24 -0000 1.2
@@ -1,32 +1,32 @@
-2013-05-30 Alberto Garcia <agarcia@igalia.com>
-
- [GTK] Needs to check for harfbuzz-icu
- https://bugs.webkit.org/show_bug.cgi?id=116978
-
- Reviewed by Xan Lopez.
-
- HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
- also need to check for it in order to get the necessary flags for
- the compiler and the linker.
-
- We keep this conditional for now since we still want to support
- earlier versions of HarfBuzz.
-
- * Source/autotools/FindDependencies.m4:
-
-Index: /trunk/Source/autotools/FindDependencies.m4
-===================================================================
---- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
-+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
-@@ -376,4 +376,11 @@
- [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
- fi
-+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
-+# Since we support earlier HarfBuzz versions we keep this conditional for now.
-+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
-+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
-+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
+2013-05-30 Alberto Garcia <agarcia@igalia.com>
+
+ [GTK] Needs to check for harfbuzz-icu
+ https://bugs.webkit.org/show_bug.cgi?id=116978
+
+ Reviewed by Xan Lopez.
+
+ HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
+ also need to check for it in order to get the necessary flags for
+ the compiler and the linker.
+
+ We keep this conditional for now since we still want to support
+ earlier versions of HarfBuzz.
+
+ * Source/autotools/FindDependencies.m4:
+
+Index: /trunk/Source/autotools/FindDependencies.m4
+===================================================================
+--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962)
++++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963)
+@@ -376,4 +376,11 @@
+ [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
+ fi
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
++# Since we support earlier HarfBuzz versions we keep this conditional for now.
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
++fi
+ AC_SUBST([FREETYPE_CFLAGS])
+ AC_SUBST([FREETYPE_LIBS])
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-06 5:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-06 5:09 [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch Alexandre Rostovtsev (tetromino)
-- strict thread matches above, loose matches on Subject: below --
2013-06-06 5:12 Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox