[pango/f18] Fix a compiler warning issue. (#902861)
by Akira TAGOH
commit 4f90e6b9aee8b7c325b81b8aeec43c0d89e85e0f
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Mon Jun 17 11:35:03 2013 +0900
Fix a compiler warning issue. (#902861)
pango-fix-pedantic-warning-in-pango-font-h.patch | 62 ++++++++++++++++++++++
pango.spec | 7 ++-
2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/pango-fix-pedantic-warning-in-pango-font-h.patch b/pango-fix-pedantic-warning-in-pango-font-h.patch
new file mode 100644
index 0000000..ecff064
--- /dev/null
+++ b/pango-fix-pedantic-warning-in-pango-font-h.patch
@@ -0,0 +1,62 @@
+From 0493b1beb113118b9573f10a87f43814a78a788a Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad(a)behdad.org>
+Date: Sun, 9 Dec 2012 19:49:29 -0500
+Subject: [PATCH] Bug 689882 - pango-font.h:381: error: comma at end of
+ enumerator list
+
+---
+ pango/pango-font.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index ce1a421..3d7aeb9 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -378,7 +378,7 @@ enum
+ {
+ PANGO_GLYPH_EMPTY = ((PangoGlyph)0x0FFFFFFF),
+ PANGO_GLYPH_INVALID_INPUT = ((PangoGlyph)0xFFFFFFFF),
+- PANGO_GLYPH_UNKNOWN_FLAG = ((PangoGlyph)0x10000000),
++ PANGO_GLYPH_UNKNOWN_FLAG = ((PangoGlyph)0x10000000)
+ };
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+
+--
+1.8.1.4
+
+From 8c1a6ef147edceb05921bb892d620bdced277662 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls(a)ceridwen.us>
+Date: Sat, 29 Dec 2012 13:36:33 -0800
+Subject: [PATCH] Revert "Make PANGO_GLYPH flags an enum to make
+ gobject-introspection happy."
+
+This reverts commit 7274bd56db3ce2f02594687a307d22aa99c787c4.
+Whatever the problem was with g-ir-scanner, it's resolved.
+---
+ pango/pango-font.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pango/pango-font.h b/pango/pango-font.h
+index 3d7aeb9..eea27b4 100644
+--- a/pango/pango-font.h
++++ b/pango/pango-font.h
+@@ -374,12 +374,10 @@ struct _PangoFontClass
+ #define PANGO_UNKNOWN_GLYPH_HEIGHT 14
+
+ #endif /* PANGO_ENABLE_BACKEND */
+-enum
+-{
+- PANGO_GLYPH_EMPTY = ((PangoGlyph)0x0FFFFFFF),
+- PANGO_GLYPH_INVALID_INPUT = ((PangoGlyph)0xFFFFFFFF),
+- PANGO_GLYPH_UNKNOWN_FLAG = ((PangoGlyph)0x10000000)
+-};
++
++#define PANGO_GLYPH_EMPTY ((PangoGlyph)0x0FFFFFFF)
++#define PANGO_GLYPH_INVALID_INPUT ((PangoGlyph)0xFFFFFFFF)
++#define PANGO_GLYPH_UNKNOWN_FLAG ((PangoGlyph)0x10000000)
+ #define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+
+
+--
+1.8.1.4
+
diff --git a/pango.spec b/pango.spec
index 82d5ab1..31f8e74 100644
--- a/pango.spec
+++ b/pango.spec
@@ -10,11 +10,12 @@
Summary: System for layout and rendering of internationalized text
Name: pango
Version: 1.32.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/pango
Source: http://download.gnome.org/sources/pango/1.32/pango-%{version}.tar.xz
+Patch0: %{name}-fix-pedantic-warning-in-pango-font-h.patch
URL: http://www.pango.org
Requires: glib2 >= %{glib2_version}
@@ -62,6 +63,7 @@ for the pango package.
%prep
%setup -q -n pango-%{version}
+%patch0 -p1 -b .0-pedantic-warning
%build
@@ -133,6 +135,9 @@ fi
%changelog
+* Mon Jun 17 2013 Akira TAGOH <tagoh(a)redhat.com> - 1.32.3-2
+- Fix a compiler warning issue. (#902861)
+
* Wed Nov 21 2012 Richard Hughes <hughsient(a)gmail.com> - 1.32.3-1
- Update to 1.32.3
10 years, 11 months
[pango/f18] Temporarily Revert " Update to 1.32.6" to apply a fix to 1.32.3 because 1.32.6 requires newer fontco
by Akira TAGOH
commit bf9e4786f911838db97cd82752c019a1c277519e
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Mon Jun 17 11:15:45 2013 +0900
Temporarily Revert " Update to 1.32.6"
to apply a fix to 1.32.3 because 1.32.6 requires newer fontconfig.
This reverts commit 49c3f7a30b6999789d267465794ba44f23edd413.
.gitignore | 1 -
pango.spec | 5 +----
sources | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d01b5d..408b04f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,3 @@ pango-1.28.1.tar.bz2
/pango-1.32.1.tar.xz
/pango-1.32.2.tar.xz
/pango-1.32.3.tar.xz
-/pango-1.32.6.tar.xz
diff --git a/pango.spec b/pango.spec
index e2dc1c7..82d5ab1 100644
--- a/pango.spec
+++ b/pango.spec
@@ -9,7 +9,7 @@
Summary: System for layout and rendering of internationalized text
Name: pango
-Version: 1.32.6
+Version: 1.32.3
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -133,9 +133,6 @@ fi
%changelog
-* Mon Mar 04 2013 Richard Hughes <rhughes(a)redhat.com> - 1.32.6-1
-- Update to 1.32.6
-
* Wed Nov 21 2012 Richard Hughes <hughsient(a)gmail.com> - 1.32.3-1
- Update to 1.32.3
diff --git a/sources b/sources
index 0d516b1..2e9132e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1af2e3a0ac5a258eff5ceddb6ed60ebd pango-1.32.6.tar.xz
+bb9fa1ec80b6db302904ead037ba330e pango-1.32.3.tar.xz
10 years, 11 months
Broken dependencies: fontforge
by Fedora Koji Build System
fontforge has broken dependencies in the epel-5 tree:
On x86_64:
fontforge-20080828-1.1.el5.i386 requires libpython2.4.so.1.0
Please resolve this as soon as possible.
10 years, 11 months
Broken dependencies: fontforge
by Fedora Koji Build System
fontforge has broken dependencies in the epel-5 tree:
On x86_64:
fontforge-20080828-1.1.el5.i386 requires libpython2.4.so.1.0
Please resolve this as soon as possible.
10 years, 11 months
[sil-charis-fonts] Update to 4.114
by Kevin Fenzi
commit 44a0905576f2a666c7a7f9c4f7cb9961561381b2
Author: Kevin Fenzi <kevin(a)scrye.com>
Date: Tue Jun 11 14:03:40 2013 -0600
Update to 4.114
.gitignore | 1 +
sil-charis-fonts.spec | 11 +++++++----
sources | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0135bb4..7fc8786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
CharisSIL4.106.zip
+/CharisSIL-4.114.zip
diff --git a/sil-charis-fonts.spec b/sil-charis-fonts.spec
index 5fe98c4..fff5672 100644
--- a/sil-charis-fonts.spec
+++ b/sil-charis-fonts.spec
@@ -4,8 +4,8 @@
%global archivename CharisSIL
Name: %{fontname}-fonts
-Version: 4.106
-Release: 7%{?dist}
+Version: 4.114
+Release: 1%{?dist}
Summary: A serif smart font similar to Bitstream Charter
Group: User Interface/X
@@ -13,7 +13,7 @@ License: OFL
URL: http://scripts.sil.org/CharisSILFont
# Actual download URL
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&forma...
-Source0: %{archivename}%{version}.zip
+Source0: %{archivename}-%{version}.zip
Source1: %{name}-fontconfig.conf
@@ -33,7 +33,7 @@ optimized for readability in long printed documents.
%prep
-%setup -q -n %{archivename}
+%setup -q -n %{archivename}-%{version}
for txt in *.txt ; do
fold -s $txt > $txt.new
sed -i 's/\r//' $txt.new
@@ -70,6 +70,9 @@ rm -fr %{buildroot}
%changelog
+* Tue Jun 11 2013 Kevin Fenzi <kevin(a)scrye.com> 4.114-1
+- Update to 4.114
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.106-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index df286a1..8a4c126 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-045aea5116c6c20e5b84e165d9727f0c CharisSIL4.106.zip
+ed1bb764abd0934583ffabddd67e450e CharisSIL-4.114.zip
10 years, 11 months
