r36424 - in /desktop/experimental/pango1.0/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Dec 7 01:15:47 UTC 2012
Author: ah
Date: Fri Dec 7 01:15:47 2012
New Revision: 36424
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36424
Log:
New upstream release
Added:
desktop/experimental/pango1.0/debian/patches/13_configure-thai-modules.patch
desktop/experimental/pango1.0/debian/patches/14_makefile_modules_ft2_link_harfbuzz.patch
Modified:
desktop/experimental/pango1.0/debian/changelog
desktop/experimental/pango1.0/debian/control.in
desktop/experimental/pango1.0/debian/libpango1.0-0.symbols
desktop/experimental/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
desktop/experimental/pango1.0/debian/patches/series
desktop/experimental/pango1.0/debian/rules
Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/changelog [utf-8] Fri Dec 7 01:15:47 2012
@@ -1,3 +1,27 @@
+pango1.0 (1.32.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - bump glib build-dependency to >= 2.33.12 according to configure.ac
+ - add build-dependency on libharfbuzz-dev (>= 0.9.9-1)
+ * Drop patches from upstream, now part of release:
+ - 00git_memory_leak.patch
+ - 00git_missing_prototype.patch
+ - 00git_thai_zero_width_spaces.patch
+ * Update patches to apply:
+ - 10_scan-module-files-in-dirs.patch
+ - 11_module-files-append-module-files-d.patch
+ - 12_module-files-append-compat-module-files-d.patch
+ * Add patch to fix build error during configure:
+ - 13_configure-thai-modules.patch
+ * Add patch to fix build during linking of module basic-fc:
+ - 14_makefile_modules_ft2_link_harfbuzz.patch
+ * debian/rules: bump MODVER to 1.8.0
+ * Update libpango1.0-0.symbols
+ - some new additions
+ - libpangox-1.0.so.0 (pango_x_* symbols) removed
+
+ -- Andreas Henriksson <andreas at fatal.se> Thu, 06 Dec 2012 22:35:26 +0100
+
pango1.0 (1.30.1-1) experimental; urgency=low
* New upstream bug fix release.
Modified: desktop/experimental/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control.in?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/control.in [utf-8] Fri Dec 7 01:15:47 2012
@@ -14,12 +14,13 @@
libx11-dev (>= 2:1.3.3-2),
libxrender-dev (>= 1:0.9.0.2-2),
libxt-dev,
- libglib2.0-dev (>= 2.31.0),
+ libglib2.0-dev (>= 2.33.12),
pkg-config,
libxft-dev (>= 2.1.14-2),
libfontconfig1-dev (>= 2.5.0),
libcairo2-dev (>= 1.8.10-3),
libthai-dev (>= 0.1.9),
+ libharfbuzz-dev (>= 0.9.9-1),
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.5),
gir1.2-glib-2.0,
Modified: desktop/experimental/pango1.0/debian/libpango1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/libpango1.0-0.symbols?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/libpango1.0-0.symbols [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/libpango1.0-0.symbols [utf-8] Fri Dec 7 01:15:47 2012
@@ -59,6 +59,7 @@
pango_color_to_string at Base 1.18.0
pango_config_key_get at Base 1.14.0
pango_config_key_get_system at Base 1.30.1
+ pango_context_changed at Base 1.32.4
pango_context_get_base_dir at Base 1.14.0
pango_context_get_base_gravity at Base 1.18.0
pango_context_get_font_description at Base 1.14.0
@@ -68,6 +69,7 @@
pango_context_get_language at Base 1.14.0
pango_context_get_matrix at Base 1.14.0
pango_context_get_metrics at Base 1.14.0
+ pango_context_get_serial at Base 1.32.4
pango_context_get_type at Base 1.14.0
pango_context_list_families at Base 1.14.0
pango_context_load_font at Base 1.14.0
@@ -151,6 +153,7 @@
pango_font_get_metrics at Base 1.14.0
pango_font_get_type at Base 1.14.0
pango_font_map_create_context at Base 1.22.0
+ pango_font_map_get_serial at Base 1.32.4
pango_font_map_get_shape_engine_type at Base 1.14.0
pango_font_map_get_type at Base 1.14.0
pango_font_map_list_families at Base 1.14.0
@@ -253,6 +256,7 @@
pango_layout_get_log_attrs_readonly at Base 1.29.4
pango_layout_get_pixel_extents at Base 1.14.0
pango_layout_get_pixel_size at Base 1.14.0
+ pango_layout_get_serial at Base 1.32.4
pango_layout_get_single_paragraph_mode at Base 1.14.0
pango_layout_get_size at Base 1.14.0
pango_layout_get_spacing at Base 1.14.0
@@ -370,6 +374,7 @@
pango_script_iter_new at Base 1.14.0
pango_script_iter_next at Base 1.14.0
pango_shape at Base 1.14.0
+ pango_shape_full at Base 1.32.4
pango_skip_space at Base 1.14.0
pango_split_file_list at Base 1.14.0
pango_stretch_get_type at Base 1.14.0
@@ -518,43 +523,6 @@
pango_ot_tag_from_script at Base 1.18.0
pango_ot_tag_to_language at Base 1.18.0
pango_ot_tag_to_script at Base 1.18.0
-libpangox-1.0.so.0 libpango1.0-0 #MINVER#
-* Build-Depends-Package: libpango1.0-dev
- pango_x_apply_ligatures at Base 1.14.0
- pango_x_context_set_funcs at Base 1.14.0
- pango_x_face_get_coverage at Base 1.14.0
- pango_x_face_get_type at Base 1.14.0
- pango_x_face_remove at Base 1.14.0
- pango_x_fallback_shape at Base 1.14.0
- pango_x_family_get_type at Base 1.14.0
- pango_x_find_first_subfont at Base 1.14.0
- pango_x_font_cache_free at Base 1.14.0
- pango_x_font_cache_load at Base 1.14.0
- pango_x_font_cache_new at Base 1.14.0
- pango_x_font_cache_unload at Base 1.14.0
- pango_x_font_get_type at Base 1.29.4
- pango_x_font_get_unknown_glyph at Base 1.14.0
- pango_x_font_map_for_display at Base 1.14.0
- pango_x_font_map_get_font_cache at Base 1.14.0
- pango_x_font_map_get_type at Base 1.14.0
- pango_x_font_new at Base 1.14.0
- pango_x_font_subfont_xlfd at Base 1.14.0
- pango_x_fontmap_atom_from_name at Base 1.14.0
- pango_x_fontmap_cache_add at Base 1.14.0
- pango_x_fontmap_cache_remove at Base 1.14.0
- pango_x_fontmap_get_display at Base 1.14.0
- pango_x_fontmap_name_from_atom at Base 1.14.0
- pango_x_get_context at Base 1.14.0
- pango_x_get_shaper_map at Base 1.14.0
- pango_x_get_unknown_glyph at Base 1.14.0
- pango_x_has_glyph at Base 1.14.0
- pango_x_list_subfonts at Base 1.14.0
- pango_x_load_font at Base 1.14.0
- pango_x_make_matching_xlfd at Base 1.14.0
- pango_x_render at Base 1.14.0
- pango_x_render_layout at Base 1.14.0
- pango_x_render_layout_line at Base 1.14.0
- pango_x_shutdown_display at Base 1.14.0
libpangoxft-1.0.so.0 libpango1.0-0 #MINVER#
* Build-Depends-Package: libpango1.0-dev
pango_xft_font_get_display at Base 1.14.0
Modified: desktop/experimental/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch [utf-8] Fri Dec 7 01:15:47 2012
@@ -45,7 +45,7 @@
+ else
{
- const gchar *module_file_dir = g_path_get_dirname (files[n]);
-- process_module_file(module_file, module_file_dir);
+- process_module_file (module_file, module_file_dir);
- g_free ((gpointer) module_file_dir);
- fclose(module_file);
+ module_file = g_fopen (files[n], "r");
Modified: desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] Fri Dec 7 01:15:47 2012
@@ -14,17 +14,19 @@
char **files;
int n;
-@@ -540,7 +545,12 @@
- "pango.modules",
- NULL);
-
-- files = pango_split_file_list (file_str);
-+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
-+ file_str,
-+ module_files_d_str,
-+ NULL);
+@@ -540,7 +545,14 @@
+ files[2] = NULL;
+ }
+ else
+- files = pango_split_file_list (file_str);
++ {
++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++ file_str,
++ module_files_d_str,
++ NULL);
+
-+ files = pango_split_file_list (list_str);
++ files = pango_split_file_list (list_str);
++ }
n = 0;
while (files[n])
Modified: desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] Fri Dec 7 01:15:47 2012
@@ -30,9 +30,9 @@
char **files;
int n;
@@ -545,6 +558,17 @@
- "pango.modules",
- NULL);
-
+ }
+ else
+ {
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+ /* prefer compat_module_files_d_str over module_files_d_str on the above
+ * arches if it's usable */
@@ -44,9 +44,9 @@
+ else /* continued below */
+#endif
+
- list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
- file_str,
- module_files_d_str,
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ file_str,
+ module_files_d_str,
@@ -598,6 +622,9 @@
g_strfreev (files);
g_free (list_str);
Added: desktop/experimental/pango1.0/debian/patches/13_configure-thai-modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/13_configure-thai-modules.patch?rev=36424&op=file
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/13_configure-thai-modules.patch (added)
+++ desktop/experimental/pango1.0/debian/patches/13_configure-thai-modules.patch [utf-8] Fri Dec 7 01:15:47 2012
@@ -1,0 +1,26 @@
+------------------------------------------------------------------------
+checking modules to link statically... arabic-lang,basic-fc,basic-win32,basic-coretext,indic-lang,,thai-lang
+checking dynamic modules to build... arabic-lang,basic-fc,basic-win32,basic-coretext,indic-lang,,thai-lang (those built into Pango will be excluded)
+configure: error: specified module not recognized
+------------------------------------------------------------------------
+
+Complains about empty module name ^^^
+Avoid adding extra , when appending to empty thai_modules.
+
+diff --git a/configure.ac b/configure.ac
+index da10fd7..e7bba3e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -491,7 +491,11 @@ indic_modules="indic-lang"
+ thai_modules=""
+
+ if $have_libthai ; then
+- thai_modules="$thai_modules,thai-lang"
++ if test "$thai_modules" = "" ; then
++ thai_modules="thai-lang"
++ else
++ thai_modules="$thai_modules,thai-lang"
++ fi
+ fi
+
+ all_modules="$arabic_modules,$basic_modules,$indic_modules,$thai_modules"
Added: desktop/experimental/pango1.0/debian/patches/14_makefile_modules_ft2_link_harfbuzz.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/14_makefile_modules_ft2_link_harfbuzz.patch?rev=36424&op=file
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/14_makefile_modules_ft2_link_harfbuzz.patch (added)
+++ desktop/experimental/pango1.0/debian/patches/14_makefile_modules_ft2_link_harfbuzz.patch [utf-8] Fri Dec 7 01:15:47 2012
@@ -1,0 +1,29 @@
+libtool: link: gcc -shared -fPIC -DPIC .libs/basic-fc.o -Wl,-rpath -Wl,/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/debian/build/shared/pango/.libs -lgobject-2.0 -lgmodule-2.0 -lrt -lglib-2.0 ../../pango/.libs/libpango-1.0.so ../../pango/.libs/libpangoft2-1.0.so /usr/lib/x86_64-linux-gnu/libfreetype.so -lfontconfig -O2 -Wl,-z -Wl,relro -Wl,-z -Wl,defs -Wl,-O1 -pthread -pthread -Wl,-soname -Wl,pango-basic-fc.so -Wl,-version-script -Wl,.libs/pango-basic-fc.ver -o .libs/pango-basic-fc.so
+.libs/basic-fc.o: In function `basic_engine_shape':
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:335: undefined reference to `hb_ft_face_create_cached'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:336: undefined reference to `hb_font_create'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:337: undefined reference to `hb_font_set_funcs'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:341: undefined reference to `hb_font_set_scale'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:348: undefined reference to `hb_font_set_ppem'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:362: undefined reference to `hb_buffer_set_direction'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:363: undefined reference to `hb_glib_script_to_script'
+/home/gem/opt/pkg-gnome/build-area/pango1.0-1.32.4/./modules/basic/basic-fc.c:363: undefined reference to `hb_buffer_set_script'
+[....]
+
+Add $(HARFBUZZ_LIBS) to pangoft2libs in modules/Modules.mk to get
+basic-fc, which uses hb_*, to link (just like in pango/Makefile.am
+as done in git commit 1a9072ec14c).
+
+
+diff --git a/modules/Module.mk b/modules/Module.mk
+index aa50470..ca6787e 100644
+--- a/modules/Module.mk
++++ b/modules/Module.mk
+@@ -8,6 +8,7 @@ pangoxlibs = \
+ pangoft2libs = \
+ $(pangolibs) \
+ $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la \
++ $(HARFBUZZ_LIBS) \
+ $(FREETYPE_LIBS)
+ pangowin32libs = \
+ $(pangolibs) \
Modified: desktop/experimental/pango1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/patches/series?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/patches/series [utf-8] Fri Dec 7 01:15:47 2012
@@ -1,6 +1,5 @@
-00git_memory_leak.patch
-00git_missing_prototype.patch
-00git_thai_zero_width_spaces.patch
10_scan-module-files-in-dirs.patch
11_module-files-append-module-files-d.patch
12_module-files-append-compat-module-files-d.patch
+13_configure-thai-modules.patch
+14_makefile_modules_ft2_link_harfbuzz.patch
Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=36424&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules [utf-8] (original)
+++ desktop/experimental/pango1.0/debian/rules [utf-8] Fri Dec 7 01:15:47 2012
@@ -22,7 +22,7 @@
APIVER := 1.0
SONAME := 0
-MODVER := 1.6.0
+MODVER := 1.8.0
SHVERSION := 1.29.4
# relative libdir
More information about the pkg-gnome-commits
mailing list