Accepting request 133467 from home:vuntz:branches:GNOME:Factory
Drop pango64.patch OBS-URL: https://build.opensuse.org/request/show/133467 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=84
This commit is contained in:
Git OBS Bridge
parent
bbe6816773
commit
51db18a45c
@ -9,7 +9,6 @@ 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.
|
||||
|
||||
@ -26,10 +25,8 @@ 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
|
||||
/usr/bin/pango-querymodules --update-cache
|
||||
fi
|
||||
if [ -x /usr/bin/pango-querymodules-64 ] ; then
|
||||
/usr/bin/pango-querymodules-64 \
|
||||
> /etc/pango/pango64.modules
|
||||
/usr/bin/pango-querymodules-64 --update-cache
|
||||
fi
|
||||
|
||||
@ -1,31 +1,30 @@
|
||||
libpango-1_0-0
|
||||
+/etc/pango/pango(64)?.modules
|
||||
requires "pango-tools-<targettype>"
|
||||
provides "pango-<targettype> = <version>"
|
||||
obsoletes "pango-<targettype> < <version>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "if test -f <prefix>%{_bindir}/pango-querymodules-64; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi"
|
||||
post "if test -f <prefix>%{_bindir}/pango-querymodules-64; then <prefix>%{_bindir}/pango-querymodules-64 --update-cache; fi"
|
||||
post "%else"
|
||||
post "if test -f <prefix>%{_bindir}/pango-querymodules; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi"
|
||||
post "if test -f <prefix>%{_bindir}/pango-querymodules; then <prefix>%{_bindir}/pango-querymodules --update-cache; fi"
|
||||
post "%endif"
|
||||
pango-tools
|
||||
+/usr/bin/pango-querymodules(-64)?
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi; fi"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules-64 --update-cache; fi; fi"
|
||||
post "%else"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi; fi"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules --update-cache; fi; fi"
|
||||
post "%endif"
|
||||
pango-module-thai-lang
|
||||
requires "pango-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
|
||||
post "<prefix>%{_bindir}/pango-querymodules-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
|
||||
post "<prefix>%{_bindir}/pango-querymodules --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
|
||||
postun "<prefix>%{_bindir}/pango-querymodules-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
|
||||
postun "<prefix>%{_bindir}/pango-querymodules --update-cache"
|
||||
postun "%endif"
|
||||
arch ppc package pango-devel
|
||||
arch sparcv9 package pango-devel
|
||||
|
||||
@ -18,9 +18,9 @@ Requires(postun): pango-tools
|
||||
# On install, update the cache
|
||||
%pango_module_post \
|
||||
%if "%_lib" == "lib64" \
|
||||
%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules \
|
||||
%{_bindir}/pango-querymodules-64 --update-cache \
|
||||
%else \
|
||||
%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules \
|
||||
%{_bindir}/pango-querymodules --update-cache \
|
||||
%endif
|
||||
|
||||
# On uninstall, update the cache. Note: we ignore upgrades (already
|
||||
@ -28,8 +28,8 @@ Requires(postun): pango-tools
|
||||
%pango_module_postun \
|
||||
if [ $1 -eq 0 ]; then \
|
||||
%if "%_lib" == "lib64" \
|
||||
%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules \
|
||||
%{_bindir}/pango-querymodules-64 --update-cache \
|
||||
%else \
|
||||
%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules \
|
||||
%{_bindir}/pango-querymodules --update-cache \
|
||||
%endif \
|
||||
fi
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 10 11:10:04 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
- Drop pango64.patch:
|
||||
+ pango-querymodules now has a --update-cache option that will
|
||||
update a pango.modules file under %{_libdir}. This means we no
|
||||
longer need to differentiate the 64bit file since it's by
|
||||
definition in a different directory.
|
||||
+ Use this --update-cache option instead of redirecting the
|
||||
output of pango-querymodules in the scriplets, in the macros we
|
||||
define in macros.pango, and in baselibs.conf.
|
||||
+ Touch %{_libdir}/pango/%{pango_binary_version}/pango.modules in
|
||||
%install instead of %{_sysconfdir}/pango/pango.modules: this is
|
||||
the new file listing the modules.
|
||||
+ Update README.SuSE accordingly.
|
||||
+ As a side-effect, this fixes bnc#346210.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 9 19:54:00 UTC 2012 - zaitor@opensuse.org
|
||||
|
||||
@ -5,10 +22,9 @@ Sun Sep 9 19:54:00 UTC 2012 - zaitor@opensuse.org
|
||||
+ The module cache file can now be located in libdir.
|
||||
+ Initial work towards making pango thread-safe.
|
||||
+ Update to Unicode 6.1.
|
||||
+ Deprecate a few API.
|
||||
+ Bugs fixed: bgo#682421, bgo#678721, bgo#678997, bgo#653347,
|
||||
bgo#682952.
|
||||
+ Deprecate pango-ot.h, pango_fc_font_kern_glyphs and
|
||||
pango_lookup_aliases
|
||||
- Rebased pango64.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
25
pango.spec
25
pango.spec
@ -30,17 +30,15 @@ Source: http://download.gnome.org/sources/pango/1.31/%{name}-%{version}.
|
||||
Source1: README.SuSE
|
||||
Source2: macros.pango
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream.
|
||||
Patch0: pango64.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(harfbuzz) >= 0.9
|
||||
BuildRequires: pkgconfig(harfbuzz) >= 0.9.3
|
||||
BuildRequires: pkgconfig(libthai) >= 0.1.9
|
||||
BuildRequires: pkgconfig(xft)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
@ -136,7 +134,6 @@ to develop applications that require these.
|
||||
%setup -q
|
||||
%if "%{_lib}" == "lib64"
|
||||
cp -a %{SOURCE1} .
|
||||
%patch0 -p0
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -147,10 +144,9 @@ make %{?_smp_mflags}
|
||||
%make_install
|
||||
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/pango/
|
||||
touch %{buildroot}%{_sysconfdir}/pango/pango.modules
|
||||
touch %{buildroot}%{_libdir}/pango/%{pango_binary_version}/pango.modules
|
||||
%if "%{_lib}" == "lib64"
|
||||
mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64
|
||||
mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules
|
||||
%endif
|
||||
# Install rpm macros
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
@ -163,21 +159,20 @@ rm -rf %{buildroot}
|
||||
# Note: when updating scriptlets, don't forget to also update baselibs.conf
|
||||
###########################################################################
|
||||
|
||||
# Convenient %define for the scriplets
|
||||
# Convenient %%define for the scriplets
|
||||
%if "%{_lib}" == "lib64"
|
||||
%define _pango_querymodules %{_bindir}/pango-querymodules-64
|
||||
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules
|
||||
%else
|
||||
%define _pango_querymodules %{_bindir}/pango-querymodules
|
||||
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules
|
||||
%endif
|
||||
%define _pango_querymodules_update_cache %{_pango_querymodules} --update-cache
|
||||
|
||||
%post -n libpango-1_0-0
|
||||
/sbin/ldconfig
|
||||
%if 0
|
||||
# In case libpango-1_0-0 gets installed before pango-tools, we don't want to
|
||||
# fail. So we make the call to pango-querymodules dependent on the existence of
|
||||
# the binary. This is why we also have a %post for pango-tools.
|
||||
# the binary. This is why we also have a %%post for pango-tools.
|
||||
%endif
|
||||
if test -f %{_pango_querymodules}; then
|
||||
%{_pango_querymodules_update_cache}
|
||||
@ -201,7 +196,7 @@ fi
|
||||
%if 0
|
||||
# If we install pango-tools for the first time, then we should run it in case
|
||||
# libpango-1_0-0 was installed first (ie, if
|
||||
# %{_libdir}/pango/%{pango_binary_version} already exists) which means
|
||||
# %%{_libdir}/pango/%%{pango_binary_version} already exists) which means
|
||||
# pango-querymodules couldn't run there.
|
||||
%endif
|
||||
if [ $1 == 1 ]; then
|
||||
@ -220,17 +215,13 @@ fi
|
||||
%endif
|
||||
%dir %{_libdir}/pango
|
||||
%dir %{_libdir}/pango/%{pango_binary_version}
|
||||
%ghost %{_libdir}/pango/%{pango_binary_version}/pango.modules
|
||||
%dir %{_libdir}/pango/%{pango_binary_version}/modules
|
||||
%{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-lang.so
|
||||
%{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-fc.so
|
||||
%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so
|
||||
%{_libdir}/lib*.so.*
|
||||
%dir %{_sysconfdir}/pango
|
||||
%if "%{_lib}" == "lib64"
|
||||
%ghost %{_sysconfdir}/pango/pango64.modules
|
||||
%else
|
||||
%ghost %{_sysconfdir}/pango/pango.modules
|
||||
%endif
|
||||
|
||||
%files -n typelib-1_0-Pango-1_0
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
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. */
|
||||
@@ -537,7 +537,7 @@
|
||||
files = g_new (char *, 3);
|
||||
|
||||
files[0] = g_build_filename (pango_get_sysconf_subdirectory (),
|
||||
- "pango.modules",
|
||||
+ "pango64.modules",
|
||||
NULL);
|
||||
files[1] = g_build_filename (pango_get_lib_subdirectory (),
|
||||
MODULE_VERSION,
|
||||
@@ -620,7 +620,7 @@ build_map (PangoMapInfo *info)
|
||||
if (!no_module_warning)
|
||||
{
|
||||
gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
|
||||
- "pango.modules",
|
||||
+ "pango64.modules",
|
||||
NULL);
|
||||
g_critical ("No modules found:\n"
|
||||
"No builtin or dynamically loaded modules were found.\n"
|
||||
Index: modules/Makefile.in
|
||||
===================================================================
|
||||
--- modules/Makefile.in.orig
|
||||
+++ modules/Makefile.in
|
||||
@@ -572,10 +572,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" ; \
|
||||
Loading…
Reference in New Issue
Block a user