From 0ed643a27e2d3afbcb591a4c0948a5af04463941 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Wed, 7 Dec 2011 20:24:26 +0000 Subject: [PATCH] Remove old Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- app-text/xournal/ChangeLog | 6 +- app-text/xournal/Manifest | 32 +++---- .../files/xournal-0.4.5-xoprint-len.patch | 88 ------------------- app-text/xournal/xournal-0.4.5-r2.ebuild | 55 ------------ 4 files changed, 19 insertions(+), 162 deletions(-) delete mode 100644 app-text/xournal/files/xournal-0.4.5-xoprint-len.patch delete mode 100644 app-text/xournal/xournal-0.4.5-r2.ebuild diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog index 11dddf4e245e..c01edc986c5f 100644 --- a/app-text/xournal/ChangeLog +++ b/app-text/xournal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xournal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.26 2011/11/28 23:45:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.27 2011/12/07 20:24:26 dilfridge Exp $ + + 07 Dec 2011; Andreas K. Huettel + -xournal-0.4.5-r2.ebuild, -files/xournal-0.4.5-xoprint-len.patch: + Remove old 28 Nov 2011; Andreas K. Huettel xournal-0.4.5_p20111022-r1.ebuild, diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest index d999fc7ab447..f1969b70ec16 100644 --- a/app-text/xournal/Manifest +++ b/app-text/xournal/Manifest @@ -1,33 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX xournal-0.4.5-xoprint-len.patch 4299 RMD160 e1fe28debea0d010494aa79f3a6eaf47853dd0b2 SHA1 2b642dc6d01a8c89095e150323ca755276000636 SHA256 0b2bb739e2719658186df82379f083daf71f0a6883aeb7f93f97312cf4cdb96e AUX xournal-0.4.5_p20111022-aspectratio.patch 3547 RMD160 fc53a86e58b7f5c0de3d3e31c43506d88b120a11 SHA1 fdb8fdaeeb4cfb8022c1a0c899a5bf024e2c29e1 SHA256 27791e240551c2987088d8d979a9389a9dbbb9fda836d537f3637e7966af52ac AUX xournal-0.4.5_p20111022-gtk-recent.patch 11391 RMD160 411e88bbe51468cb58ff0debe999d46b53ad79a6 SHA1 8bde995a0757ee691afbca0afa3efc5ddab76339 SHA256 d9b8bf35b527e4283554b804acd0a455f66a8e08fa753370bca34ae543d1f58c AUX xournal-0.4.5_p20111022-underlinking.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5 -DIST xournal-0.4.5-sjg-image-rev7.patch.gz 24137 RMD160 9a389ecf98dfc2b709555b8efc0c0f440fe4fa00 SHA1 96a2d88e5ff2b9452a1acf46592e650eb5088c8d SHA256 ac89ceb35941d9a13804fd6650f1a6b84474b3f50c89682611f2f9e66af96705 -DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40 SHA1 390cb275774469ed1b04b7268dd625bd456c895e SHA256 a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1 DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f -EBUILD xournal-0.4.5-r2.ebuild 1294 RMD160 d123c46f65d0c25e1c134d0e99c15f2f6503f6e5 SHA1 1c50cdbc98773a000e87ad8eee2d720513d21040 SHA256 6e9e1dd61017407aa6c734c15510a98de913f2a5637e0210e3a9b9f9da8cc38a EBUILD xournal-0.4.5_p20111022-r1.ebuild 1360 RMD160 33e40e6641ea97887e1a3b56dec378a36de80b7a SHA1 14675cd3f91f560e1709773230d5189e20d10714 SHA256 05dce04e141c22faa3986afd954ee3187cc643a8c06ce1b6f04d494e37ff2b8b EBUILD xournal-0.4.5_p20111022.ebuild 1240 RMD160 fa82fb5c1ac4033dcd30e0853378e9f781a9df10 SHA1 d4abe9a92b5bd4998dda91e45ef75b60d0e6c84b SHA256 6156e93806823a09b4c9f66a50d656faff1e69954dfab7af37c79efc76434320 -MISC ChangeLog 4679 RMD160 53040ab2e873ce73be210af93f9bc956d67430aa SHA1 e2b4a0a451309ae44480decdf16d41710804571a SHA256 6a7c0b69648428225fe693747678b1105e974ef16093cb37f494d98d5cfc0e3b +MISC ChangeLog 4818 RMD160 f2832d94e4d940a5c9a37064cb5252d3b0c78a5e SHA1 fb4877bc8715515e94a4f1c6fd79c74ad0d0359b SHA256 ee1624cfcad924315c5ac13563680cec9db49fe5b8525b4188e2175381a320d2 MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJO1B0TAAoJENwGBM22xffem5sP/RdD89hSWzcaHLOJrWyypuju -9XiYrOpAMC/3V1vDGmeU1rw/YWJ+t3JrRvFUFwm+hY/oO+lzOeUwou+9t5IhIi1V -ELPRBt82Kxy7CmCC+R1TXnePHsEsyO0oc9NTqteVJmRl7k8ke8SksUHpH+4rlt8y -viPgkdA1V3YyFeBPVz86Ngg+Iy7IOshRhB+MQosIf8C8Pn3z+29QkL8zWaVrEBCm -EhO1LZrayBi1DXSnzAJUO5dp2HJPoP/w5oyYZX5peRiZwWCd2BRQm9TRRQW9W1bz -D4LoSE6V25VUxflLM+QP5hcwx7egWI6Gk6Ciurs/+KQtXTGy2jelpZekjKlwPHnI -HptW6zbm1Yz/zz8YCNmnhP1OcVfUkm47VGwIDiW/I4JzdpA9Bf2ioONj1XHP0Xw4 -oMSpySw3KrFdwysd9TZBwiekcmSm1zzVlOpuz4dJYoRQw3zu5yyDUIhY13/7mGUw -0LlinZPIuvLGOs/0hG9QjRqwo1VD+Xl3c8Akn3o4qZOpFvhpHb/QrBzyv8neKlac -Ef2NgcEMchrVKNIn6R5mso8eYx1SYeaIJcpoZejpvIsa3gzIXyB4q/iycCDRPa2w -9ruq0dBechn2a2MCgg/ZlI7VAicXZdLnf4mmiaC/WNPBuYsNxB7g9BNv7ecjTny+ -1FUcKVy1/JAi6lBcxrE7 -=4KP+ +iQIcBAEBCgAGBQJO38uGAAoJENwGBM22xffez14P/2E5pjsk8T4u7ANlX0YlFvAs +9osNxkQLXzkYsZjEd3sBKgqB+ksFq25C3RFTMnq3xx44DnDfmFnlQ7zmSXPpWShC +wcNtDneovrh8zC08ORGMB4sp6aKriifkmFgeUm0/dTl8MSzbi0LdGMjaWMmX5TNJ +r/3ECD7xwvR18z3g1NJRhV58XXza8M4/hH7itnozgXOVyxsHO1JO9nIGXcz8IcOg +mO31P/VDFkzLPfRpxFWovQCiVvHcTXG1xBy2mD3MPuBtPsgEksVZnJyuM55V7F1X +M7fTXrGPo1TMq5aWvW2jnyKoGFf4UMGIMlvafQQ2ywH6S5VSFlJlFEvBUvPyNQfU +Bs7tj6LId2ENXkKgloL+rsseDrxSStyvAYq7RMtYGBITJ3ot5o19Ka4Wf/9PxH16 +26MGFx1BEXudS73pgbiTXH81i3IA1Uw0MKiKf1na20VM51M9ZGbFs/yNSmLpJG23 +Vt2gSsfFGqWc/IviYN5nMKXCxJNyoY7AYGfTSYJgAKvn+hApL9f2Z+4OBT0CQWp4 +CYUTY49Nbdaf/CK9bdKOcdIfUXOlyjiArQIeg4abskE1uhVUJlyn/dEhgx3KJfDV +xeKrJxQ/hO1XEOpxLRAuh/7fJg8AE+18OKnkAyhymrRSukEVhObJ35f6O09g8GCw ++TxYUnECGvfTYH8pOHqd +=OLbM -----END PGP SIGNATURE----- diff --git a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch b/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch deleted file mode 100644 index 56105af6cf4b..000000000000 --- a/app-text/xournal/files/xournal-0.4.5-xoprint-len.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- 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); diff --git a/app-text/xournal/xournal-0.4.5-r2.ebuild b/app-text/xournal/xournal-0.4.5-r2.ebuild deleted file mode 100644 index 549821768ea8..000000000000 --- a/app-text/xournal/xournal-0.4.5-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5-r2.ebuild,v 1.4 2011/09/20 14:43:13 nativemad Exp $ - -EAPI=4 -inherit gnome2 eutils - -DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus." -HOMEPAGE="http://xournal.sourceforge.net/" - -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+pdf doc" - -COMMONDEPEND=" - app-text/poppler[cairo] - dev-libs/atk - dev-libs/glib - gnome-base/libgnomecanvas - media-libs/freetype - media-libs/fontconfig - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango -" -RDEPEND="${COMMONDEPEND} - pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) -" -DEPEND="${COMMONDEPEND} - dev-util/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-xoprint-len.patch #bug 287701 - epatch "${DISTDIR}"/${P}-sjg-image-rev7.patch.gz # the image patch -} - -#src_configure() { -# default -#} - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install - - dodoc ChangeLog AUTHORS README - if use doc ; then - dohtml -r html-doc/* - fi -} -- 2.26.2