pool/pango
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pango?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2007-12-22 18:34:09 +00:00 committed by Git OBS Bridge
parent 9289a62119
commit 2bc3ccb886
5 changed files with 109 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
README.SuSE Normal file
View File

@ -0,0 +1,35 @@
README for bi-architecture 64 bit platforms users
=================================================
Current version of Pango has a problem running 32 and 64 version on
single machine. See http://bugzilla.gnome.org/show_bug.cgi?id=129534 for
more information.
To work around this problem, 64 bit version for SuSE Linux uses special
names for following files:
/usr/bin/pango-querymodules: /usr/bin/pango-querymodules-64
/etc/pango/pango.modules: /etc/pango/pango.modules64
This can cause problems during self-compilation of packages.
To work-around these problems (introduced by this work-around), you
should:
Either:
- Make a patch of package (please do not send it to package
developers, it's temporary solution).
Or:
- Install 32 bit version of Pango.
- After installation, you must run following commands:
if [ -x /usr/bin/pango-querymodules ] ; then
/usr/bin/pango-querymodules \
> /etc/pango/pango.modules
fi
if [ -x /usr/bin/pango-querymodules-64 ] ; then
/usr/bin/pango-querymodules-64 \
> /etc/pango/pango64.modules
fi

36
pango-biarch.patch
View File

@ -1,36 +0,0 @@
=== modified file 'pango/Makefile.am'
--- pango/Makefile.am 2007-12-17 22:19:25 +0000
+++ pango/Makefile.am 2007-12-17 22:19:32 +0000
@@ -19,6 +19,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-I$(top_srcdir) \
$(PANGO_DEBUG_FLAGS) \
=== modified file 'pango/Makefile.in'
--- pango/Makefile.in 2007-12-17 22:19:25 +0000
+++ pango/Makefile.in 2007-12-17 22:19:32 +0000
@@ -426,6 +426,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-I$(top_srcdir) \
$(PANGO_DEBUG_FLAGS) \
=== modified file 'pango/modules.c'
--- pango/modules.c 2007-12-17 22:19:25 +0000
+++ pango/modules.c 2007-12-17 22:19:32 +0000
@@ -508,6 +508,7 @@
if (!file_str)
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
+ HOST,
"pango.modules",
NULL);

5
pango.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 19 19:07:08 CST 2007 - maw@suse.de
- Revert to using pango64.patch for the time being (#349940).
-------------------------------------------------------------------
Mon Dec 17 23:55:23 CET 2007 - maw@suse.de

15
pango.spec
View File

@ -16,10 +16,12 @@ License: LGPL v2.1 or later
Group: System/Libraries
AutoReqProv: on
Version: 1.19.2
Release: 1
Release: 3
Summary: System for Layout and Rendering of Internationalised Text
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2
Patch0: pango-biarch.patch
Source1: README.SuSE
# Patch0: pango-biarch.patch
Patch0: pango64.patch
# This appears to be upstream now
# Patch2: bugzilla-53228-artificial-bold-and-italic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -85,7 +87,10 @@ Authors:
%prep
%setup -q
%if "%_lib" == "lib64"
cp -a %{S:1} .
%patch0 -p0
%endif
%build
autoreconf -f -i
@ -110,7 +115,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT
%post
sbin/ldconfig
/sbin/ldconfig
%if "%_lib" == "lib64"
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules-64\
@ -140,7 +145,7 @@ fi
%files
%defattr(-,root,root)
%if "%_lib" == "lib64"
%doc README AUTHORS COPYING ChangeLog
%doc README AUTHORS COPYING ChangeLog README.SuSE
%else
%doc README AUTHORS COPYING ChangeLog
%endif
@ -173,6 +178,8 @@ fi
%{_datadir}/gtk-doc/html/pango
%changelog
* Wed Dec 19 2007 - maw@suse.de
- Revert to using pango64.patch for the time being (#349940).
* Mon Dec 17 2007 - maw@suse.de
- Remove references to README.SuSE
- s#%%run_ldconfig#/sbin/ldconfig#.

58
pango64.patch Normal file
View File

@ -0,0 +1,58 @@
Index: modules/Makefile.am
===================================================================
--- modules/Makefile.am.orig
+++ modules/Makefile.am
@@ -30,10 +30,10 @@ install-data-local: $(top_builddir)/pang
@if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ \> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
$(top_builddir)/pango/pango-querymodules$(EXEEXT) \
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
+ > $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \
else \
echo "***" ; \
echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
Index: modules/pangorc
===================================================================
--- modules/pangorc.orig
+++ modules/pangorc
@@ -5,4 +5,4 @@
#
[Pango]
-ModuleFiles = ../modules/pango.modules
+ModuleFiles = ../modules/pango64.modules
Index: pango/modules.c
===================================================================
--- pango/modules.c.orig
+++ pango/modules.c
@@ -328,7 +328,7 @@ find_or_create_module (const char *raw_p
/* This is an entry put there by make install on the
* packager's system. On Windows a prebuilt Pango
* package can be installed in a random
- * location. The pango.modules file distributed in
+ * location. The pango64.modules file distributed in
* such a package contains paths from the package
* builder's machine. Replace the path with the real
* one on this machine. */
@@ -508,7 +508,7 @@ read_modules (void)
if (!file_str)
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
- "pango.modules",
+ "pango64.modules",
NULL);
files = pango_split_file_list (file_str);
@@ -619,7 +619,7 @@ build_map (PangoMapInfo *info)
if (!no_module_warning)
{
gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
- "pango.modules",
+ "pango64.modules",
NULL);
g_warning ("No builtin or dynamically\n"
"loaded modules were found. Pango will not work correctly.\n"