diff options
author | Martin Väth <martin@mvath.de> | 2017-07-15 08:35:37 +0200 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2017-07-15 08:35:37 +0200 |
commit | ec2e54d842d1a69087dd845eb0843ca0f947a40f (patch) | |
tree | 3bcecf272bb42a4b1edaaa973d55d8d29c365b4a | |
parent | Mass bump: Fix systemd unit path, split /usr (diff) | |
download | mv-ec2e54d842d1a69087dd845eb0843ca0f947a40f.tar.gz mv-ec2e54d842d1a69087dd845eb0843ca0f947a40f.tar.bz2 mv-ec2e54d842d1a69087dd845eb0843ca0f947a40f.zip |
app-text/mbtpdfasm: Add with fixes to save from removal
-rw-r--r-- | app-text/mbtpdfasm/Manifest | 2 | ||||
-rw-r--r-- | app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff | 37 | ||||
-rw-r--r-- | app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff | 11 | ||||
-rw-r--r-- | app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff | 101 | ||||
-rw-r--r-- | app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff | 26 | ||||
-rw-r--r-- | app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild | 71 | ||||
-rw-r--r-- | app-text/mbtpdfasm/metadata.xml | 9 | ||||
-rw-r--r-- | metadata/pkg_desc_index | 1 |
8 files changed, 258 insertions, 0 deletions
diff --git a/app-text/mbtpdfasm/Manifest b/app-text/mbtpdfasm/Manifest new file mode 100644 index 00000000..dfbba68b --- /dev/null +++ b/app-text/mbtpdfasm/Manifest @@ -0,0 +1,2 @@ +DIST mbtPdfAsm-1.0.28.tar.gz 253032 SHA256 e416aab7d805308f82f3cbe91f964eab6be5da8a232bd52e13a048740194048f +DIST mbtpdfasm-1.0.28-manual.pdf.bz2 6581 SHA256 648a21a665098815dc0ae9ec1b2faa8f24a0e99ab64af1dbadf54515959cff89 diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff new file mode 100644 index 00000000..bd63327f --- /dev/null +++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff @@ -0,0 +1,37 @@ +--- pdfFile.hpp.orig 2007-07-26 16:32:50.000000000 +0200 ++++ pdfFile.hpp 2007-10-05 22:40:50.000000000 +0200 +@@ -161,7 +161,7 @@ +
+ //int findInheritRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
+ int makeRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
+- int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, char *add, int lgAdd);
++ int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, int add, int lgAdd);
+
+ bool fast; // version rapide, on ne gère pas les options
+ bool closed; //protection plus rien n'est possible aprés l'appel à la fonction close
+--- pdfFile.cpp.orig 2007-08-22 20:44:31.000000000 +0200 ++++ pdfFile.cpp 2007-10-05 22:42:39.000000000 +0200 +@@ -934,7 +934,7 @@ + /* ********************************************** */ + #pragma warning(disable : 4100) + +-int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, char *add, int lgAdd) { ++int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, int add, int lgAdd) { + char *pc; + int lgRes, lgBuf, j, nObj, r; + +@@ -973,12 +973,12 @@ + } + + if ( (lgAdd != 0) && (add != 0) ) { +- switch ( (int)add ) { ++ switch ( add ) { + case _Resources: + + break; + default: +- memcpy(pc + lgRes, add + sizeof(int), lgAdd); ++ memcpy(pc + lgRes, (char *)add + sizeof(int), lgAdd); + lgRes += lgAdd; + } + } diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff new file mode 100644 index 00000000..99b109d5 --- /dev/null +++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff @@ -0,0 +1,11 @@ +--- main.cpp.orig 2007-07-30 15:25:27.000000000 +0200 ++++ main.cpp 2007-10-05 22:49:29.000000000 +0200 +@@ -52,7 +52,7 @@ + char tc[1000];
+ int i;
+
+- fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s", strVersion, strMPAURL);
++ fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s\n", strVersion, strMPAURL);
+
+ return 0;
+ }
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff new file mode 100644 index 00000000..278a3c03 --- /dev/null +++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff @@ -0,0 +1,101 @@ +--- makefile.orig 2007-07-26 19:33:54.000000000 +0200 ++++ makefile 2007-10-05 22:54:31.000000000 +0200 +@@ -10,66 +10,66 @@ + ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o + # + $(EXENAME): $(LF) $(ZLIB) +- $(CC) $(LF) $(ZLIB) -o $@ ++ $(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@ + $(O)/main.o: main.cpp +- $(CC) -c main.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c main.cpp -o $*.o + $(O)/pdfFile.o: pdfFile.cpp +- $(CC) -c pdfFile.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfFile.cpp -o $*.o + $(O)/pdfObject.o: pdfObject.cpp +- $(CC) -c pdfObject.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfObject.cpp -o $*.o + $(O)/pdfEncrypt.o: pdfEncrypt.cpp +- $(CC) -c pdfEncrypt.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfEncrypt.cpp -o $*.o + $(O)/pdfNames.o: pdfNames.cpp +- $(CC) -c pdfNames.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfNames.cpp -o $*.o + $(O)/pdfFileOutline.o: pdfFileOutline.cpp +- $(CC) -c pdfFileOutline.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfFileOutline.cpp -o $*.o + $(O)/pdfXrefTable.o: pdfXrefTable.cpp +- $(CC) -c pdfXrefTable.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfXrefTable.cpp -o $*.o + $(O)/string.o: string.cpp +- $(CC) -c string.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c string.cpp -o $*.o + $(O)/pdfString.o: pdfString.cpp +- $(CC) -c pdfString.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c pdfString.cpp -o $*.o + $(O)/rc4.o: rc4.cpp +- $(CC) -c rc4.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c rc4.cpp -o $*.o + $(O)/md5.o: md5.c +- $(CC) -c md5.c -o $*.o ++ $(CC) $(CXXFLAGS) -c md5.c -o $*.o + $(O)/listeFichiers_linux.o: listeFichiers_linux.cpp +- $(CC) -c listeFichiers_linux.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c listeFichiers_linux.cpp -o $*.o + $(O)/diversPdf.o: diversPdf.cpp +- $(CC) -c diversPdf.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c diversPdf.cpp -o $*.o + $(O)/strMatcher.o: strMatcher.cpp +- $(CC) -c strMatcher.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c strMatcher.cpp -o $*.o + $(O)/pcre.o: pcre.c +- $(CC) -c pcre.c -o $*.o ++ $(CC) $(CXXFLAGS) -c pcre.c -o $*.o + $(O)/study.o: study.c +- $(CC) -c study.c -o $*.o ++ $(CC) $(CXXFLAGS) -c study.c -o $*.o + $(O)/get.o: get.c +- $(CC) -c get.c -o $*.o ++ $(CC) $(CXXFLAGS) -c get.c -o $*.o + $(O)/maketables.o: maketables.c +- $(CC) -c maketables.c -o $*.o ++ $(CC) $(CXXFLAGS) -c maketables.c -o $*.o + $(O)/calc.o: calc.cpp +- $(CC) -c calc.cpp -o $*.o ++ $(CC) $(CXXFLAGS) -c calc.cpp -o $*.o + $(O)/adler32.o: adler32.c zlib.h zconf.h +- $(CC) -c adler32.c -o $*.o ++ $(CC) $(CXXFLAGS) -c adler32.c -o $*.o + $(O)/compress.o: compress.c zlib.h zconf.h +- $(CC) -c compress.c -o $*.o ++ $(CC) $(CXXFLAGS) -c compress.c -o $*.o + $(O)/crc32.o: crc32.c zlib.h zconf.h crc32.h +- $(CC) -c crc32.c -o $*.o ++ $(CC) $(CXXFLAGS) -c crc32.c -o $*.o + $(O)/deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h +- $(CC) -c deflate.c -o $*.o ++ $(CC) $(CXXFLAGS) -c deflate.c -o $*.o + $(O)/gzio.o: gzio.c zutil.h zlib.h zconf.h +- $(CC) -c gzio.c -o $*.o ++ $(CC) $(CXXFLAGS) -c gzio.c -o $*.o + $(O)/infback.o: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h +- $(CC) -c infback.c -o $*.o ++ $(CC) $(CXXFLAGS) -c infback.c -o $*.o + $(O)/inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +- $(CC) -c inffast.c -o $*.o ++ $(CC) $(CXXFLAGS) -c inffast.c -o $*.o + $(O)/inflate.o: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h +- $(CC) -c inflate.c -o $*.o ++ $(CC) $(CXXFLAGS) -c inflate.c -o $*.o + $(O)/inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h +- $(CC) -c inftrees.c -o $*.o ++ $(CC) $(CXXFLAGS) -c inftrees.c -o $*.o + $(O)/trees.o: trees.c zutil.h zlib.h zconf.h deflate.h trees.h +- $(CC) -c trees.c -o $*.o ++ $(CC) $(CXXFLAGS) -c trees.c -o $*.o + $(O)/uncompr.o: uncompr.c zlib.h zconf.h +- $(CC) -c uncompr.c -o $*.o ++ $(CC) $(CXXFLAGS) -c uncompr.c -o $*.o + $(O)/zutil.o: zutil.c zutil.h zlib.h zconf.h +- $(CC) -c zutil.c -o $*.o ++ $(CC) $(CXXFLAGS) -c zutil.c -o $*.o diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff new file mode 100644 index 00000000..02446ae6 --- /dev/null +++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff @@ -0,0 +1,26 @@ +diff -Naur work.orig/makefile work/makefile +--- work.orig/makefile 2010-07-21 01:11:54.390456452 +0200 ++++ work/makefile 2010-07-21 01:12:22.843456093 +0200 +@@ -9,8 +9,8 @@ + LF = $(O)/main.o $(O)/pdfFile.o $(O)/pdfXrefTable.o $(O)/string.o $(O)/rc4.o $(O)/md5.o $(O)/pdfString.o $(O)/listeFichiers_linux.o $(O)/diversPdf.o $(O)/strMatcher.o $(O)/pcre.o $(O)/study.o $(O)/get.o $(O)/maketables.o $(O)/pdfEncrypt.o $(O)/pdfFileOutline.o $(O)/pdfNames.o $(O)/pdfObject.o $(O)/calc.o + ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o + # +-$(EXENAME): $(LF) $(ZLIB) +- $(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@ ++$(EXENAME): $(LF) ++ $(CC) $(LDFLAGS) $(LF) -lz -o $@ + $(O)/main.o: main.cpp + $(CC) $(CXXFLAGS) -c main.cpp -o $*.o + $(O)/pdfFile.o: pdfFile.cpp +diff -Naur work.orig/pdfObject.cpp work/pdfObject.cpp +--- work.orig/pdfObject.cpp 2007-08-22 20:13:56.000000000 +0200 ++++ work/pdfObject.cpp 2010-07-21 01:11:54.486455713 +0200 +@@ -1,7 +1,7 @@ + #include "pdfObject.hpp"
+ #include "pdfXrefTable.hpp"
+ #include "diversPdf.hpp"
+-#include "zlib.h"
++#include <zlib.h>
+ #include <stdlib.h>
+
+ #ifdef DEBUG_MEM_LEAK
diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild new file mode 100644 index 00000000..1e0e087d --- /dev/null +++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +RESTRICT="mirror" +inherit toolchain-funcs + +MY_P="mbtPdfAsm-${PV}" + +DESCRIPTION="Tool to assemble/merge, extract information from, and update the metadata in PDF" +HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html" +SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz + http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +IUSE="" + +S="${WORKDIR}" + +# https://bugs.gentoo.org/show_bug.cgi?id=594668 +patch_to_standard() { + local i j b + b='[^_abcdefghijklmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789]' + for i + do j=$i + while ! case $j in + *__*) + false;; + esac + do j=${j%%__*}_m_${j#*__} + done + case $i in + _[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*) + j=_m$i;; + esac + [ "$j" != "$i" ] || die + einfo "Renaming $i -> $j" + sed -i \ + -e "s/^$i\$/$j/g" \ + -e "s/^$i\($b\)/$j\1/g" \ + -e "s/\($b\)$i\($b\)/\1$j\2/g" \ + -- *.c* *.h* || die + done +} + +src_prepare() { + eapply -p0 \ + "${FILESDIR}/${P}-makefile.diff" \ + "${FILESDIR}/${P}-64bit.diff" \ + "${FILESDIR}/${P}-main.diff" + + # use system zlib + eapply "${FILESDIR}/${P}-zlib.diff" + mv "zlib.h" "zlib.h.disabled" || die + + patch_to_standard $(sed -n -e 's/^[[:space:]]*\#define[[:space:]]*\(_[ABCDEFGHIJKLMNOPQRSTUVWXYZ][^[:space:]]*\|[^[:space:]]*__[^[:space:]]*\).*/\1/p' \ + -- *.c* *.h*) + default +} + +src_compile() { + emake CC="$(tc-getCXX)" || die "emake failed" +} + +src_install() { + dobin mbtPdfAsm || die "install failed" + insinto "/usr/share/doc/${PF}" + newins ${P}-manual.pdf mbtPdfAsm.pdf +} diff --git a/app-text/mbtpdfasm/metadata.xml b/app-text/mbtpdfasm/metadata.xml new file mode 100644 index 00000000..c030c08d --- /dev/null +++ b/app-text/mbtpdfasm/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <longdescription lang="en"> + This program can be used to assemble/merge PDF files, extract + information from PDF files, and update the metadata in PDF files. + </longdescription> +</pkgmetadata> diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 20f01623..8b0d8ba8 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -50,6 +50,7 @@ app-shells/zsh-syntax-highlighting 0.5.0 99999999: Fish shell like syntax highli app-shells/zshrc-mv 3.10: A zshrc file initializing zsh specific interactive features app-text/ispell 3.3.02-r1 3.4.00: fast screen-oriented spelling checker app-text/lesspipe 1.83 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon +app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities app-text/recode 3.6_p20-r1: Convert files between various character sets app-text/stardict 3.0.6-r3 4.0.0_pre20160518-r1: A international dictionary supporting fuzzy and glob style matching |