r33871 - in /desktop/unstable/pango1.0/debian: changelog patches/10_scan-module-files-in-dirs.patch patches/11_module-files-append-module-files-d.patch patches/12_module-files-append-compat-module-files-d.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Mar 31 19:47:54 UTC 2012
Author: biebl
Date: Sat Mar 31 19:47:53 2012
New Revision: 33871
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33871
Log:
Refreshed and updated patches.
Modified:
desktop/unstable/pango1.0/debian/changelog
desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=33871&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Sat Mar 31 19:47:53 2012
@@ -2,8 +2,9 @@
* New upstream release.
* debian/watch: Track stable releases again.
-
- -- Michael Biebl <biebl at debian.org> Sat, 31 Mar 2012 21:41:35 +0200
+ * Refreshed and updated patches.
+
+ -- Michael Biebl <biebl at debian.org> Sat, 31 Mar 2012 21:47:39 +0200
pango1.0 (1.29.5-1) experimental; urgency=low
Modified: desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch?rev=33871&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/10_scan-module-files-in-dirs.patch [utf-8] Sat Mar 31 19:47:53 2012
@@ -1,7 +1,7 @@
-Index: pango1.0-1.28.1/pango/modules.c
+Index: pango-1.30.0/pango/modules.c
===================================================================
---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:21.255815917 +0200
-+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:31.287811515 +0200
+--- pango-1.30.0.orig/pango/modules.c 2012-03-31 21:43:35.406085813 +0200
++++ pango-1.30.0/pango/modules.c 2012-03-31 21:46:56.234078708 +0200
@@ -40,6 +40,9 @@
#define PANGO_MODULE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), PANGO_TYPE_MODULE, PangoModule))
#define PANGO_IS_MODULE(module) (G_TYPE_CHECK_INSTANCE_TYPE ((module), PANGO_TYPE_MODULE))
@@ -12,7 +12,7 @@
typedef struct _PangoMapInfo PangoMapInfo;
typedef struct _PangoEnginePair PangoEnginePair;
typedef struct _PangoSubmap PangoSubmap;
-@@ -540,11 +543,36 @@
+@@ -545,13 +548,40 @@
while (n-- > 0)
{
@@ -32,7 +32,9 @@
+ module_file = g_fopen (pathname, "r");
+ if (module_file)
+ {
-+ process_module_file(module_file);
++ const gchar *module_file_dir = g_path_get_dirname (files[n]);
++ process_module_file(module_file, module_file_dir);
++ g_free ((gpointer) module_file_dir);
+ fclose(module_file);
+ }
+ g_free (pathname);
@@ -42,12 +44,16 @@
+ }
+ else
{
-- process_module_file(module_file);
+- const gchar *module_file_dir = g_path_get_dirname (files[n]);
+- process_module_file(module_file, module_file_dir);
+- g_free ((gpointer) module_file_dir);
- fclose(module_file);
+ module_file = g_fopen (files[n], "r");
+ if (module_file)
+ {
-+ process_module_file(module_file);
++ const gchar *module_file_dir = g_path_get_dirname (files[n]);
++ process_module_file(module_file, module_file_dir);
++ g_free ((gpointer) module_file_dir);
+ fclose(module_file);
+ }
}
Modified: desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch?rev=33871&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/11_module-files-append-module-files-d.patch [utf-8] Sat Mar 31 19:47:53 2012
@@ -1,8 +1,8 @@
-Index: pango1.0-1.28.1/pango/modules.c
+Index: pango-1.30.0/pango/modules.c
===================================================================
---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:31.287811515 +0200
-+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:36.626808929 +0200
-@@ -525,6 +525,11 @@
+--- pango-1.30.0.orig/pango/modules.c 2012-03-31 21:42:48.366087473 +0200
++++ pango-1.30.0/pango/modules.c 2012-03-31 21:42:49.782087424 +0200
+@@ -530,6 +530,11 @@
FILE *module_file;
char *file_str = pango_config_key_get ("Pango/ModuleFiles");
@@ -14,7 +14,7 @@
char **files;
int n;
-@@ -535,7 +540,12 @@
+@@ -540,7 +545,12 @@
"pango.modules",
NULL);
@@ -28,7 +28,7 @@
n = 0;
while (files[n])
-@@ -577,6 +587,8 @@
+@@ -586,6 +596,8 @@
}
g_strfreev (files);
Modified: desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch?rev=33871&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/patches/12_module-files-append-compat-module-files-d.patch [utf-8] Sat Mar 31 19:47:53 2012
@@ -1,7 +1,7 @@
-Index: pango1.0-1.28.1/pango/modules.c
+Index: pango-1.30.0/pango/modules.c
===================================================================
---- pango1.0-1.28.1.orig/pango/modules.c 2010-06-15 18:09:36.626808929 +0200
-+++ pango1.0-1.28.1/pango/modules.c 2010-06-15 18:09:38.606801290 +0200
+--- pango-1.30.0.orig/pango/modules.c 2012-03-31 21:42:49.782087424 +0200
++++ pango-1.30.0/pango/modules.c 2012-03-31 21:42:55.302087230 +0200
@@ -24,6 +24,7 @@
#include <string.h>
#include <limits.h>
@@ -10,7 +10,7 @@
#include <gmodule.h>
#include <glib/gstdio.h>
-@@ -529,6 +530,18 @@
+@@ -534,6 +535,18 @@
MODULE_VERSION,
"module-files.d",
NULL);
@@ -29,7 +29,7 @@
char *list_str;
char **files;
int n;
-@@ -540,6 +553,17 @@
+@@ -545,6 +558,17 @@
"pango.modules",
NULL);
@@ -47,7 +47,7 @@
list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
file_str,
module_files_d_str,
-@@ -589,6 +613,9 @@
+@@ -598,6 +622,9 @@
g_strfreev (files);
g_free (list_str);
g_free (module_files_d_str);
More information about the pkg-gnome-commits
mailing list