| 1 |
tetromino 13/06/06 05:12:24 |
| 2 |
|
| 3 |
Modified: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 4 |
Log: |
| 5 |
Avoid CRLF line endings in patch. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: webkit-gtk-2.0.2-harfbuzz-0.9.18.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.0.2-harfbuzz-0.9.18.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 6 Jun 2013 05:09:38 -0000 1.1 |
| 23 |
+++ webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 6 Jun 2013 05:12:24 -0000 1.2 |
| 24 |
@@ -1,32 +1,32 @@ |
| 25 |
-2013-05-30 Alberto Garcia <agarcia@××××××.com> |
| 26 |
- |
| 27 |
- [GTK] Needs to check for harfbuzz-icu |
| 28 |
- https://bugs.webkit.org/show_bug.cgi?id=116978 |
| 29 |
- |
| 30 |
- Reviewed by Xan Lopez. |
| 31 |
- |
| 32 |
- HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we |
| 33 |
- also need to check for it in order to get the necessary flags for |
| 34 |
- the compiler and the linker. |
| 35 |
- |
| 36 |
- We keep this conditional for now since we still want to support |
| 37 |
- earlier versions of HarfBuzz. |
| 38 |
- |
| 39 |
- * Source/autotools/FindDependencies.m4: |
| 40 |
- |
| 41 |
-Index: /trunk/Source/autotools/FindDependencies.m4 |
| 42 |
-=================================================================== |
| 43 |
---- /trunk/Source/autotools/FindDependencies.m4 (revision 150962) |
| 44 |
-+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963) |
| 45 |
-@@ -376,4 +376,11 @@ |
| 46 |
- [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) |
| 47 |
- fi |
| 48 |
-+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. |
| 49 |
-+# Since we support earlier HarfBuzz versions we keep this conditional for now. |
| 50 |
-+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then |
| 51 |
-+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) |
| 52 |
-+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" |
| 53 |
-+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" |
| 54 |
-+fi |
| 55 |
- AC_SUBST([FREETYPE_CFLAGS]) |
| 56 |
- AC_SUBST([FREETYPE_LIBS]) |
| 57 |
+2013-05-30 Alberto Garcia <agarcia@××××××.com> |
| 58 |
+ |
| 59 |
+ [GTK] Needs to check for harfbuzz-icu |
| 60 |
+ https://bugs.webkit.org/show_bug.cgi?id=116978 |
| 61 |
+ |
| 62 |
+ Reviewed by Xan Lopez. |
| 63 |
+ |
| 64 |
+ HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we |
| 65 |
+ also need to check for it in order to get the necessary flags for |
| 66 |
+ the compiler and the linker. |
| 67 |
+ |
| 68 |
+ We keep this conditional for now since we still want to support |
| 69 |
+ earlier versions of HarfBuzz. |
| 70 |
+ |
| 71 |
+ * Source/autotools/FindDependencies.m4: |
| 72 |
+ |
| 73 |
+Index: /trunk/Source/autotools/FindDependencies.m4 |
| 74 |
+=================================================================== |
| 75 |
+--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962) |
| 76 |
++++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963) |
| 77 |
+@@ -376,4 +376,11 @@ |
| 78 |
+ [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) |
| 79 |
+ fi |
| 80 |
++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. |
| 81 |
++# Since we support earlier HarfBuzz versions we keep this conditional for now. |
| 82 |
++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then |
| 83 |
++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) |
| 84 |
++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" |
| 85 |
++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" |
| 86 |
++fi |
| 87 |
+ AC_SUBST([FREETYPE_CFLAGS]) |
| 88 |
+ AC_SUBST([FREETYPE_LIBS]) |
Archives