This commit is contained in:
parent
2f13770f27
commit
9289a62119
35
README.SuSE
35
README.SuSE
@ -1,35 +0,0 @@
|
||||
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
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:78a0fd6e4b63aa7c3bb26f1045d8f36ee3b3f840d3b3f2d006483863c7369e32
|
||||
size 1392725
|
3
pango-1.19.2.tar.bz2
Normal file
3
pango-1.19.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:871e2da805098703ca54916388452cbc649bd5e5711d2dcc4e05b0228f85bb14
|
||||
size 1422189
|
36
pango-biarch.patch
Normal file
36
pango-biarch.patch
Normal file
@ -0,0 +1,36 @@
|
||||
=== 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);
|
||||
|
||||
|
@ -1,3 +1,95 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 17 23:55:23 CET 2007 - maw@suse.de
|
||||
|
||||
- Remove references to README.SuSE
|
||||
- s#%run_ldconfig#/sbin/ldconfig#.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 17 16:20:24 CST 2007 - maw@suse.de
|
||||
|
||||
- Replace pango64.patch with pango-biarch.patch (#346210)
|
||||
- Concomitant with the above change, remove README.SuSE, as it is
|
||||
no longer necessary.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 17 16:06:51 CST 2007 - maw@suse.de
|
||||
|
||||
- Update to version 1.19.2:
|
||||
+ Bugs (bugzilla.gnome.org) fixed: #485536, #500549, #492517,
|
||||
#495091, #502926, #399573, #478914, #501938, and #501575
|
||||
+ Cleanups in the HarfBuzz code and merges with upstream/Qt changes
|
||||
+ Document cairo examples and misc doc improvements
|
||||
+ Use pkg-config to detect cairo features
|
||||
+ New public macro: PANGO_GLYPH_INVALID_INPUT
|
||||
+ Render a crossed box for each invalid input byte to
|
||||
pango_layout_set_text; previously an ASCII question mark was
|
||||
used; this crossed box has a glyph of value
|
||||
PANGO_GLYPH_INVALID_INPUT.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 26 10:25:54 CST 2007 - maw@suse.de
|
||||
|
||||
- Actually remove the build root in %clean.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 23 16:37:51 CST 2007 - maw@suse.de
|
||||
|
||||
- Update to version 1.19.0:
|
||||
+ Two OpenType engine fixes, which make Nafees Nastaliq font
|
||||
work great, and avoids warnings with some other fonts
|
||||
+ Fix minor leak in win32 backend
|
||||
+ Update list of languages to that of fontconfig-2.4.91
|
||||
+ Various optimizations
|
||||
+ Make sure all boxed type copy/free functions accept NULL as
|
||||
legitimate input; previously most were g_return_[val_]if_fail()ing
|
||||
it; this is mostly for convenience when writing code in C
|
||||
+ Apply 'vkrn' GPOS feature in vertical writing
|
||||
+ In pangofc, set "pangoversion" in pattern passed to fontconfig,
|
||||
such that font configuration can condition on being driven by
|
||||
Pango or not
|
||||
+ Various optimizations and cleanups in the OpenType Layout
|
||||
engine, aka HarfBuzz
|
||||
+ Changed APIs:
|
||||
* All PangoAttribute constructors are changed to initialize
|
||||
the attribute to the range [0..MAXUINT]. The range was
|
||||
undefined previously; all custom attribute constructors
|
||||
are recommended to call the new pango_attribute_init() to
|
||||
do the same
|
||||
* Public API change: Mark the following types as abstract:
|
||||
PangoFont
|
||||
PangoFontFace
|
||||
PangoFontFamily
|
||||
PangoFontMap
|
||||
PangoFcFont
|
||||
PangoFcFontMap
|
||||
PangoContext may be marked so in the future too
|
||||
* Make following macros public; previously they were only
|
||||
defined for backend/engine implementations:
|
||||
PANGO_GLYPH_EMPTY
|
||||
PANGO_GLYPH_UNKNOWN_FLAG
|
||||
PANGO_GET_UNKNOWN_GLYPH()
|
||||
+ New public API:
|
||||
* Convenience for initializing custom attributes:
|
||||
pango_attribute_init()
|
||||
* Adding boxed type for PangoGlyphItem:
|
||||
PANGO_TYPE_GLYPH_ITEM
|
||||
pango_glyph_item_copy()
|
||||
pango_glyph_item_get_type()
|
||||
* Add missing copy function for a boxed type in C:
|
||||
pango_layout_iter_copy()
|
||||
* Add missing getter:
|
||||
pango_layout_iter_get_layout()
|
||||
* Convenience for writing custom PangoRenderer's:
|
||||
pango_renderer_get_layout()
|
||||
pango_renderer_get_layout_line()
|
||||
* PangoFc extensions to fontconfig's pattern syntax:
|
||||
PANGO_FC_GRAVITY
|
||||
PANGO_FC_VERSION
|
||||
+ Bugs (bugzilla.gnome.org) fixed: #483600, #490661,
|
||||
#489909, #488840, #486932, #486951, #485621, #485566,
|
||||
#485559, #481537, #478865, #472924, #472629, #472303,
|
||||
#471601, #471577, #471571, #471568, and #469641.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 19 01:34:45 CEST 2007 - maw@suse.de
|
||||
|
||||
|
99
pango.spec
99
pango.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package pango (Version 1.18.2)
|
||||
# spec file for package pango (Version 1.19.2)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,15 +12,14 @@
|
||||
|
||||
Name: pango
|
||||
BuildRequires: cairo-devel gtk-doc perl-XML-Parser sgml-skel
|
||||
License: LGPL v2 or later
|
||||
License: LGPL v2.1 or later
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
Version: 1.18.2
|
||||
Version: 1.19.2
|
||||
Release: 1
|
||||
Summary: System for Layout and Rendering of Internationalised Text
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2
|
||||
Source2: README.SuSE
|
||||
Patch: pango64.patch
|
||||
Patch0: pango-biarch.patch
|
||||
# This appears to be upstream now
|
||||
# Patch2: bugzilla-53228-artificial-bold-and-italic.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -86,11 +85,7 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if "%_lib" == "lib64"
|
||||
cp -a %{S:2} .
|
||||
%patch
|
||||
%endif
|
||||
# %patch2 -p1
|
||||
%patch0 -p0
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
@ -112,7 +107,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
|
||||
%clean
|
||||
# rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
sbin/ldconfig
|
||||
@ -127,7 +122,7 @@ LD_LIBRARY_PATH=usr/%{_lib}\
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
/sbin/ldconfig
|
||||
%if "%_lib" == "lib64"
|
||||
if [ -x usr/bin/pango-querymodules-64 ] ; then
|
||||
LD_LIBRARY_PATH=usr/%{_lib}\
|
||||
@ -145,7 +140,7 @@ fi
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%if "%_lib" == "lib64"
|
||||
%doc README AUTHORS COPYING ChangeLog README.SuSE
|
||||
%doc README AUTHORS COPYING ChangeLog
|
||||
%else
|
||||
%doc README AUTHORS COPYING ChangeLog
|
||||
%endif
|
||||
@ -176,7 +171,85 @@ fi
|
||||
%files doc
|
||||
%defattr(-, root, root)
|
||||
%{_datadir}/gtk-doc/html/pango
|
||||
|
||||
%changelog
|
||||
* Mon Dec 17 2007 - maw@suse.de
|
||||
- Remove references to README.SuSE
|
||||
- s#%%run_ldconfig#/sbin/ldconfig#.
|
||||
* Mon Dec 17 2007 - maw@suse.de
|
||||
- Replace pango64.patch with pango-biarch.patch (#346210)
|
||||
- Concomitant with the above change, remove README.SuSE, as it is
|
||||
no longer necessary.
|
||||
* Mon Dec 17 2007 - maw@suse.de
|
||||
- Update to version 1.19.2:
|
||||
+ Bugs (bugzilla.gnome.org) fixed: #485536, #500549, #492517,
|
||||
[#495091], #502926, #399573, #478914, #501938, and #501575
|
||||
+ Cleanups in the HarfBuzz code and merges with upstream/Qt changes
|
||||
+ Document cairo examples and misc doc improvements
|
||||
+ Use pkg-config to detect cairo features
|
||||
+ New public macro: PANGO_GLYPH_INVALID_INPUT
|
||||
+ Render a crossed box for each invalid input byte to
|
||||
pango_layout_set_text; previously an ASCII question mark was
|
||||
used; this crossed box has a glyph of value
|
||||
PANGO_GLYPH_INVALID_INPUT.
|
||||
* Mon Nov 26 2007 - maw@suse.de
|
||||
- Actually remove the build root in %%clean.
|
||||
* Fri Nov 23 2007 - maw@suse.de
|
||||
- Update to version 1.19.0:
|
||||
+ Two OpenType engine fixes, which make Nafees Nastaliq font
|
||||
work great, and avoids warnings with some other fonts
|
||||
+ Fix minor leak in win32 backend
|
||||
+ Update list of languages to that of fontconfig-2.4.91
|
||||
+ Various optimizations
|
||||
+ Make sure all boxed type copy/free functions accept NULL as
|
||||
legitimate input; previously most were g_return_[val_]if_fail()ing
|
||||
it; this is mostly for convenience when writing code in C
|
||||
+ Apply 'vkrn' GPOS feature in vertical writing
|
||||
+ In pangofc, set "pangoversion" in pattern passed to fontconfig,
|
||||
such that font configuration can condition on being driven by
|
||||
Pango or not
|
||||
+ Various optimizations and cleanups in the OpenType Layout
|
||||
engine, aka HarfBuzz
|
||||
+ Changed APIs:
|
||||
* All PangoAttribute constructors are changed to initialize
|
||||
the attribute to the range [0..MAXUINT]. The range was
|
||||
undefined previously; all custom attribute constructors
|
||||
are recommended to call the new pango_attribute_init() to
|
||||
do the same
|
||||
* Public API change: Mark the following types as abstract:
|
||||
PangoFont
|
||||
PangoFontFace
|
||||
PangoFontFamily
|
||||
PangoFontMap
|
||||
PangoFcFont
|
||||
PangoFcFontMap
|
||||
PangoContext may be marked so in the future too
|
||||
* Make following macros public; previously they were only
|
||||
defined for backend/engine implementations:
|
||||
PANGO_GLYPH_EMPTY
|
||||
PANGO_GLYPH_UNKNOWN_FLAG
|
||||
PANGO_GET_UNKNOWN_GLYPH()
|
||||
+ New public API:
|
||||
* Convenience for initializing custom attributes:
|
||||
pango_attribute_init()
|
||||
* Adding boxed type for PangoGlyphItem:
|
||||
PANGO_TYPE_GLYPH_ITEM
|
||||
pango_glyph_item_copy()
|
||||
pango_glyph_item_get_type()
|
||||
* Add missing copy function for a boxed type in C:
|
||||
pango_layout_iter_copy()
|
||||
* Add missing getter:
|
||||
pango_layout_iter_get_layout()
|
||||
* Convenience for writing custom PangoRenderer's:
|
||||
pango_renderer_get_layout()
|
||||
pango_renderer_get_layout_line()
|
||||
* PangoFc extensions to fontconfig's pattern syntax:
|
||||
PANGO_FC_GRAVITY
|
||||
PANGO_FC_VERSION
|
||||
+ Bugs (bugzilla.gnome.org) fixed: #483600, #490661,
|
||||
[#489909], #488840, #486932, #486951, #485621, #485566,
|
||||
[#485559], #481537, #478865, #472924, #472629, #472303,
|
||||
[#471601], #471577, #471571, #471568, and #469641.
|
||||
* Wed Sep 19 2007 - maw@suse.de
|
||||
- Add xorg-x11-libXdmcp as a prerequisite (#310640)
|
||||
- Fix the source tarball's permissions.
|
||||
|
@ -1,58 +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. */
|
||||
@@ -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"
|
Loading…
Reference in New Issue
Block a user