rpms/xournal/EL-5 xournal-0.4.5-xoprint-len.patch, NONE, 1.1 xournal-configure.in.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 xournal.spec, 1.4, 1.5 x-xoj.desktop, 1.2, NONE xournal-configure.in-freetype.patch, 1.1, NONE xournal.desktop, 1.2, NONE xournal.xml, 1.1, NONE
Rick L. Vinyard, Jr.
rvinyard at fedoraproject.org
Tue Jun 1 18:06:53 UTC 2010
Author: rvinyard
Update of /cvs/pkgs/rpms/xournal/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2377
Modified Files:
.cvsignore sources xournal.spec
Added Files:
xournal-0.4.5-xoprint-len.patch xournal-configure.in.patch
Removed Files:
x-xoj.desktop xournal-configure.in-freetype.patch
xournal.desktop xournal.xml
Log Message:
xournal-0.4.5-xoprint-len.patch:
xo-print.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
--- NEW FILE xournal-0.4.5-xoprint-len.patch ---
--- a/src/xo-print.c
+++ b/src/xo-print.c
@@ -761,7 +761,7 @@ int pdf_draw_bitmap_background(struct Page *pg, GString *str,
make_xref(xref, xref->last+1, pdfbuf->len);
g_string_append_printf(pdfbuf,
- "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
"/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
"/BitsPerComponent 8 >> stream\n",
xref->last, zpix->len, width, height);
@@ -840,8 +840,10 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
gboolean fallback, is_binary;
guchar encoding[256];
gushort glyphs[256];
- int i, j, num, len1, len2;
- gsize len;
+ int i, j, num;
+ guint32 len1, len2;
+ guint32 tt_len;
+ gsize t1_len;
TrueTypeFont *ttfnt;
char *seg1, *seg2;
char *fontdata, *p;
@@ -862,14 +864,14 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
}
font->num_glyphs_used = num-1;
if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
- if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num,
+ if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num,
0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
make_xref(xref, xref->last+1, pdfbuf->len);
nobj_fontprog = xref->last;
g_string_append_printf(pdfbuf,
- "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
- nobj_fontprog, (int)len, (int)len);
- g_string_append_len(pdfbuf, fontdata, len);
+ "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
+ nobj_fontprog, tt_len, tt_len);
+ g_string_append_len(pdfbuf, fontdata, tt_len);
g_string_append(pdfbuf, "endstream\nendobj\n");
g_free(fontdata);
}
@@ -879,7 +881,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
else fallback = TRUE;
} else {
// embed the font file: Type1 case
- if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) {
+ if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) {
if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
is_binary = TRUE;
len1 = pfb_get_length((unsigned char *)fontdata+2);
@@ -898,7 +900,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
if (*p=='\n' || *p=='\r') p++;
if (*p=='\n' || *p=='\r') p++;
len1 = p-fontdata;
- p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
+ p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
if (p==NULL) fallback = TRUE;
else {
// rewind 512 zeros
@@ -936,7 +938,7 @@ void embed_pdffont(GString *pdfbuf, struct XrefTable *xref, struct PdfFont *font
make_xref(xref, xref->last+1, pdfbuf->len);
nobj_fontprog = xref->last;
g_string_append_printf(pdfbuf,
- "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n",
+ "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n",
nobj_fontprog, len1+len2, len1, len2);
g_string_append_len(pdfbuf, seg1, len1);
g_string_append_len(pdfbuf, seg2, len2);
@@ -1258,7 +1260,7 @@ gboolean print_to_pdf(char *filename)
tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
pg->width, pg->height);
g_string_append_printf(pdfbuf,
- "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
+ "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
n_obj_prefix, tmpstr->len, tmpstr->str);
g_string_free(tmpstr, TRUE);
g_string_prepend(pgstrm, "Q Q Q ");
@@ -1276,7 +1278,7 @@ gboolean print_to_pdf(char *filename)
make_xref(&xref, xref.last+1, pdfbuf->len);
g_string_append_printf(pdfbuf,
- "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
+ "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
xref.last, zpgstrm->len);
g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
g_string_free(zpgstrm, TRUE);
xournal-configure.in.patch:
configure.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE xournal-configure.in.patch ---
--- xournal-0.4.5/configure.in.old 2010-02-16 09:23:51.000000000 -0700
+++ xournal-0.4.5/configure.in 2010-02-16 09:37:10.000000000 -0700
@@ -9,11 +9,14 @@
AC_PROG_CC
AM_PROG_CC_STDC
AC_PROG_RANLIB
AC_HEADER_STDC
-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
+AC_CHECK_LIB([m],[sin])
+AC_CHECK_LIB([z],[gzclose])
+
+pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 freetype2 x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
GETTEXT_PACKAGE=xournal
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 21 Sep 2007 18:07:31 -0000 1.2
+++ .cvsignore 1 Jun 2010 18:06:52 -0000 1.3
@@ -1 +1 @@
-xournal-0.4.1.tar.gz
+xournal-0.4.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 21 Sep 2007 18:07:31 -0000 1.3
+++ sources 1 Jun 2010 18:06:52 -0000 1.4
@@ -1 +1 @@
-b3d352d08e71606383c31da5790b8d60 xournal-0.4.1.tar.gz
+795e4396ded2b67766eb2926be1fb4a9 xournal-0.4.5.tar.gz
Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/EL-5/xournal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xournal.spec 22 Sep 2007 01:31:44 -0000 1.4
+++ xournal.spec 1 Jun 2010 18:06:53 -0000 1.5
@@ -1,24 +1,31 @@
Name: xournal
-Version: 0.4.1
-Release: 2%{?dist}
-Summary: Xournal notetaking, sketching and PDF annotation
+Version: 0.4.5
+Release: 3%{?dist}
+Summary: Notetaking, sketching, PDF annotation and general journal
Group: Applications/Editors
License: GPLv2
URL: http://xournal.sourceforge.net/
Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-Source1: xournal.desktop
-Source2: xournal.xml
-Source3: x-xoj.desktop
-Patch0: xournal-configure.in-freetype.patch
+Patch0: xournal-configure.in.patch
+Patch1: xournal-0.4.5-xoprint-len.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: gtk2-devel >= 2.10.0
BuildRequires: libgnomecanvas-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 2.0.0
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildRequires: poppler-glib-devel >= 0.5.4
+%else
+BuildRequires: poppler-devel >= 0.5.4
+%endif
+%if 0%{?rhel} > 4
+BuildRequires: autoconf, automake
+%endif
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
+BuildRequires: gettext
Requires: poppler-utils
Requires: ghostscript
@@ -30,7 +37,8 @@ resolution) and overall functionality.
%prep
%setup -q
-%patch
+%patch0 -p1
+%patch1 -p1
%build
NOCONFIGURE=1 ./autogen.sh
@@ -57,17 +65,18 @@ for s in 16 32 48 64 128 ; do
done
# Desktop entry
-%{__install} -p -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
+%{__install} -p -m 0644 -D pixmaps/xournal.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/xournal.png
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE1}
+ xournal.desktop
# GNOME (shared-mime-info) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
+%{__install} -p -m 0644 -D xournal.xml ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/xournal.xml
# KDE (legacy) MIME type registration
-%{__install} -p -m 0644 -D %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%{__install} -p -m 0644 -D x-xoj.desktop ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-xoj.desktop
+%find_lang %{name}
%post
touch --no-create %{_datadir}/icons/hicolor || :
@@ -85,7 +94,7 @@ update-desktop-database %{_datadir}/appl
%{__rm} -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/xournal
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
@@ -101,6 +110,39 @@ update-desktop-database %{_datadir}/appl
%changelog
+* Tue Feb 16 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-3
+- Remove freetype patch and add general configure.in patch to
+ fix implicit DSO linking
+
+* Wed Jan 06 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-2
+- Added xournal-0.4.5-xoprint-len.patch to fix 64 bit systems
+
+* Mon Oct 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-1
+- New upstream release
+- Removed xournal.xml, xournal.desktop and x-xoj.desktop sources as they are now in upstream source
+- Updated gtk2 devel requirements to 2.10
+- Added poppler-glib-devel to BR
+- Added gettext BR
+- Updated summary
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.4.2.1-2
+- Fix Patch0:/%%patch mismatch (#463069)
+
+* Mon Apr 7 2008 Jeremy Katz <katzj at redhat.com> - 0.4.2.1-1
+- Update to 0.4.2.1 to fix problems with newer xorg
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.1-4
+- Autorebuild for GCC 4.3
+
+* Wed Oct 10 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-3
+- Changed permission on xournal.png from 0755 to 0644
+
* Fri Sep 21 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.1-2
- Added freetype to build requires
- Created patch to add freetype to configure.in pkgconfig
--- x-xoj.desktop DELETED ---
--- xournal-configure.in-freetype.patch DELETED ---
--- xournal.desktop DELETED ---
--- xournal.xml DELETED ---
More information about the scm-commits
mailing list