From 03db2ba0f744b1a0a55d89b750679155c42bb1bf Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sun, 21 Jan 2018 16:21:03 +0100 Subject: pcr/ploticus: updated to 2.42.r201406 --- pcr/ploticus/Makefile.patch | 81 -------------------------- pcr/ploticus/Makefile2.41.patch | 81 ++++++++++++++++++++++++++ pcr/ploticus/Makefile2.42.patch | 122 ++++++++++++++++++++++++++++++++++++++++ pcr/ploticus/PKGBUILD | 60 ++++++++++++++------ 4 files changed, 245 insertions(+), 99 deletions(-) delete mode 100644 pcr/ploticus/Makefile.patch create mode 100644 pcr/ploticus/Makefile2.41.patch create mode 100644 pcr/ploticus/Makefile2.42.patch diff --git a/pcr/ploticus/Makefile.patch b/pcr/ploticus/Makefile.patch deleted file mode 100644 index c991172c9..000000000 --- a/pcr/ploticus/Makefile.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- pl241src/src/Makefile.backup 2010-08-25 17:23:27.678303158 -0400 -+++ pl241src/src/Makefile 2010-08-25 17:23:35.078302786 -0400 -@@ -25,21 +25,21 @@ - - - ############ Option 1: build the pl executable (unix), no X11 .... --NOX11 = -DNOX11 -+#NOX11 = -DNOX11 - - - - ############ Option 2: build the pl executable (unix), with X11 enabled .... --# NOX11 = --# XOBJ = x11.o interact.o -+NOX11 = -+XOBJ = x11.o interact.o - - ############ ...AND... activate the lines below for your platform... (X11 libs & header files) - #### linux - # XLIBS = -L/usr/X11R6/lib -lX11 - # XINCLUDEDIR = -I/usr/X11R6/include - #### alt linux --# XLIBS = -lX11 --# XINCLUDEDIR = -I/usr/include/X11 -+XLIBS = -lX11 -+XINCLUDEDIR = -I/usr/include/X11 - #### 64bit linux - # XLIBS = -L/usr/X11R6/lib64 -lX11 - #### solaris -@@ -89,10 +89,10 @@ - - - ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. --exetarget: plpng --GD16LIBS = -lpng -lz --GD16H = --ZFLAG = -DWZ -+#exetarget: plpng -+#GD16LIBS = -lpng -lz -+#GD16H = -+#ZFLAG = -DWZ - - ########### Option 2: use bundled GD13 (pseudoGIF only). No additional lib dependencies. - # exetarget: pl -@@ -106,11 +106,11 @@ - - ########### Option 4: use your own GD resource with FreeType2 fonts enabled. - ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype --# exetarget: plgd18 --# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype --# GD18H = --# GDFREETYPE = -DGDFREETYPE --# ZFLAG = -DWZ -+exetarget: plgd18 -+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype -+GD18H = -+GDFREETYPE = -DGDFREETYPE -+ZFLAG = -DWZ - - ########### Option 5: don't use GD at all. - # exetarget: plnogd -@@ -133,7 +133,7 @@ - #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. - #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined. - #### This option not available for win32 --# PREFABS_DIR = "/usr/lib/ploticus/prefabs" -+PREFABS_DIR = "/usr/share/ploticus" - - - #### If you do a "make install", where do you want the executable(s) to be moved to? -@@ -141,8 +141,8 @@ - - - #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. --# LOCALEOBJ = localef.o --# LOCALE_FLAG = -DLOCALE -+LOCALEOBJ = localef.o -+LOCALE_FLAG = -DLOCALE - - #### SVG output is always available by default. - #### If you want compressed SVG (.svgz), and you selected GD13 or no GD above, diff --git a/pcr/ploticus/Makefile2.41.patch b/pcr/ploticus/Makefile2.41.patch new file mode 100644 index 000000000..c991172c9 --- /dev/null +++ b/pcr/ploticus/Makefile2.41.patch @@ -0,0 +1,81 @@ +--- pl241src/src/Makefile.backup 2010-08-25 17:23:27.678303158 -0400 ++++ pl241src/src/Makefile 2010-08-25 17:23:35.078302786 -0400 +@@ -25,21 +25,21 @@ + + + ############ Option 1: build the pl executable (unix), no X11 .... +-NOX11 = -DNOX11 ++#NOX11 = -DNOX11 + + + + ############ Option 2: build the pl executable (unix), with X11 enabled .... +-# NOX11 = +-# XOBJ = x11.o interact.o ++NOX11 = ++XOBJ = x11.o interact.o + + ############ ...AND... activate the lines below for your platform... (X11 libs & header files) + #### linux + # XLIBS = -L/usr/X11R6/lib -lX11 + # XINCLUDEDIR = -I/usr/X11R6/include + #### alt linux +-# XLIBS = -lX11 +-# XINCLUDEDIR = -I/usr/include/X11 ++XLIBS = -lX11 ++XINCLUDEDIR = -I/usr/include/X11 + #### 64bit linux + # XLIBS = -L/usr/X11R6/lib64 -lX11 + #### solaris +@@ -89,10 +89,10 @@ + + + ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. +-exetarget: plpng +-GD16LIBS = -lpng -lz +-GD16H = +-ZFLAG = -DWZ ++#exetarget: plpng ++#GD16LIBS = -lpng -lz ++#GD16H = ++#ZFLAG = -DWZ + + ########### Option 2: use bundled GD13 (pseudoGIF only). No additional lib dependencies. + # exetarget: pl +@@ -106,11 +106,11 @@ + + ########### Option 4: use your own GD resource with FreeType2 fonts enabled. + ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype +-# exetarget: plgd18 +-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +-# GD18H = +-# GDFREETYPE = -DGDFREETYPE +-# ZFLAG = -DWZ ++exetarget: plgd18 ++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype ++GD18H = ++GDFREETYPE = -DGDFREETYPE ++ZFLAG = -DWZ + + ########### Option 5: don't use GD at all. + # exetarget: plnogd +@@ -133,7 +133,7 @@ + #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. + #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined. + #### This option not available for win32 +-# PREFABS_DIR = "/usr/lib/ploticus/prefabs" ++PREFABS_DIR = "/usr/share/ploticus" + + + #### If you do a "make install", where do you want the executable(s) to be moved to? +@@ -141,8 +141,8 @@ + + + #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. +-# LOCALEOBJ = localef.o +-# LOCALE_FLAG = -DLOCALE ++LOCALEOBJ = localef.o ++LOCALE_FLAG = -DLOCALE + + #### SVG output is always available by default. + #### If you want compressed SVG (.svgz), and you selected GD13 or no GD above, diff --git a/pcr/ploticus/Makefile2.42.patch b/pcr/ploticus/Makefile2.42.patch new file mode 100644 index 000000000..f03f53f89 --- /dev/null +++ b/pcr/ploticus/Makefile2.42.patch @@ -0,0 +1,122 @@ +*** ploticus242/src/Makefile.242.orig Fri Jun 7 13:05:43 2013 +--- ploticus242/src/Makefile Wed Jan 13 16:38:29 2016 +*************** +*** 25,45 **** + + + ############ Option 1: build the pl executable (unix), no X11 .... +! NOX11 = -DNOX11 + + + + ############ Option 2: build the pl executable (unix), with X11 enabled .... +! # NOX11 = +! # XOBJ = x11.o interact.o + + ############ ...AND... activate the lines below for your platform... (X11 libs & header files) + #### linux + # XLIBS = -L/usr/X11R6/lib -lX11 + # XINCLUDEDIR = -I/usr/X11R6/include + #### alt linux +! # XLIBS = -lX11 +! # XINCLUDEDIR = -I/usr/include/X11 + #### 64bit linux + # XLIBS = -L/usr/X11R6/lib64 -lX11 + #### solaris +--- 25,45 ---- + + + ############ Option 1: build the pl executable (unix), no X11 .... +! #NOX11 = -DNOX11 + + + + ############ Option 2: build the pl executable (unix), with X11 enabled .... +! NOX11 = +! XOBJ = x11.o interact.o + + ############ ...AND... activate the lines below for your platform... (X11 libs & header files) + #### linux + # XLIBS = -L/usr/X11R6/lib -lX11 + # XINCLUDEDIR = -I/usr/X11R6/include + #### alt linux +! XLIBS = -lX11 +! XINCLUDEDIR = -I/usr/include/X11 + #### 64bit linux + # XLIBS = -L/usr/X11R6/lib64 -lX11 + #### solaris +*************** +*** 91,100 **** + + + ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. +! exetarget: plpng +! GD16LIBS = -lpng -lz +! GD16H = -I/usr/local/include +! ZFLAG = -DWZ + ### These should remain commented unless your libs are not in usual places, then alter to suit... + ### GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a + ### GD16H = -I/home/scg/lib +--- 91,100 ---- + + + ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. +! #exetarget: plpng +! #GD16LIBS = -lpng -lz +! #GD16H = -I/usr/local/include +! #ZFLAG = -DWZ + ### These should remain commented unless your libs are not in usual places, then alter to suit... + ### GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a + ### GD16H = -I/home/scg/lib +*************** +*** 111,121 **** + + ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled. + ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype +! # exetarget: plgd18 +! # GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +! # GD18H = +! # GDFREETYPE = -DGDFREETYPE +! # ZFLAG = -DWZ + + ########### Option 5: don't use GD at all. + # exetarget: plnogd +--- 111,121 ---- + + ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled. + ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype +! exetarget: plgd18 +! GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +! GD18H = +! GDFREETYPE = -DGDFREETYPE +! ZFLAG = -DWZ + + ########### Option 5: don't use GD at all. + # exetarget: plnogd +*************** +*** 140,151 **** + + + #### If you do a "make install", where do you want the executable(s) to be moved to? +! INSTALLBIN = /usr/local/bin + + + #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. +! # LOCALEOBJ = localef.o +! # LOCALE_FLAG = -DLOCALE + + #### SVG output is always available by default. + #### If you want compressed SVG (.svgz), and you selected GD13 or no GD above, +--- 140,151 ---- + + + #### If you do a "make install", where do you want the executable(s) to be moved to? +! INSTALLBIN = /usr/bin + + + #### For LOCALE support (non-roman alphabets & collation), uncomment the following.. +! LOCALEOBJ = localef.o +! LOCALE_FLAG = -DLOCALE + + #### SVG output is always available by default. + #### If you want compressed SVG (.svgz), and you selected GD13 or no GD above, diff --git a/pcr/ploticus/PKGBUILD b/pcr/ploticus/PKGBUILD index 9967597a5..4bb530d00 100644 --- a/pcr/ploticus/PKGBUILD +++ b/pcr/ploticus/PKGBUILD @@ -1,42 +1,66 @@ -# Maintainer (Arch): Chris Severance aur.severach aATt spamgourmet dott com -# Contributor (Arch): Kaiting Chen -# Contributor (Arch): Andreas Hauser +# Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com +# Contributor (AUR): Kaiting Chen +# Contributor (AUR): Andreas Hauser + +# Patches are found on the News page. +# http://ploticus.sourceforge.net/doc/news.html + +# parabola changes and rationale: +# no changes. set -u pkgname='ploticus' -pkgver='2.41' -pkgrel='1.1' +_pkgver='2.42' +pkgver="${_pkgver}" +pkgrel='2' pkgdesc='produce plots and graphs in GIF, PNG, PostScript, SVG from CSV like data' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv7h') url='http://ploticus.sourceforge.net/doc/welcome.html' license=('GPL') depends=('gd' 'libpng' 'libjpeg' 'freetype2' 'zlib' 'libx11') -conflicts=('gnustep-base') -provides=('gnustep-base') +makedepends=('patch') +source=("http://prdownloads.sourceforge.net/sourceforge/${pkgname}/pl241src.tar.gz" + "Makefile2.41.patch" + "Makefile2.42.patch") +if [ "${pkgver}" = '2.42' ]; then + source+=( + "http://prdownloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}${_pkgver/./}_src.tar.gz" + 'http://ploticus.sourceforge.net/download/execline.c.gz' + 'http://ploticus.sourceforge.net/download/init.c' + ) + pkgver="${pkgver}.r201406" +fi sha256sums=('ecccb6afcf0008d5b31da2e9e74c448564101eb7b9bbde758a3dca1f2dc8c580' - 'f0b1acc10a35b1d3c4268ee67c2520af36044991e289d538c1cb5b7bc406d4e4') -source=("http://prdownloads.sourceforge.net/sourceforge/${pkgname}/pl${pkgver/./}src.tar.gz" - 'Makefile.patch') + 'f0b1acc10a35b1d3c4268ee67c2520af36044991e289d538c1cb5b7bc406d4e4' + '07212e7e4695c34df21f73bfa0b5c1efb3e765eb070dbe074b715f1f56f31c41' + '3f29e4b9f405203a93efec900e5816d9e1b4381821881e241c08cab7dd66e0b0' + '1be5ec081977dcd6a60407999eb317f42325fef7889c5c542ec649686119cde3' + '9af92c8a7a0795cbf09aa69af336c248e1b65e42a52e5334cc208543ab803159') prepare() { set -u - cd "${srcdir}/pl${pkgver/./}src/src" - patch -Np2 -i "${srcdir}/Makefile.patch" + cd pl*${_pkgver/./}*/src/ + sed -i -e 's:^\(#define PREFABS_DIR "\)\(".*\)$:\1/usr/share/ploticus\2:g' 'pl.h' + patch -Np2 -i "${srcdir}/Makefile${_pkgver}.patch" + if [ "${_pkgver}" = '2.42' ]; then + cp -p "${srcdir}"/*.c . + fi set +u } build() { set -u - cd "${srcdir}/pl${pkgver/./}src/src" - make -s -j "$(nproc)" CC='gcc -O' + cd pl*${_pkgver/./}*/src/ + make -s -j "$(nproc)" CC='gcc -O' EXE=$pkgname set +u } package() { set -u - cd "${srcdir}/pl${pkgver/./}src/src" - install -Dpm755 'pl' -t "${pkgdir}/usr/bin/" - install -Dpm644 '../man/man1/pl.1' -t "${pkgdir}/usr/share/man/man1/" + cd pl*${_pkgver/./}*/src/ + install -Dpm755 $pkgname -t "${pkgdir}/usr/bin/" + cd "${srcdir}"/pl2*/src/ + install -Dpm644 '../man/man1/pl.1' -t "${pkgdir}"/usr/share/man/man1/pkgname.1 install -Dpm644 '../prefabs'/* -t "${pkgdir}/usr/share/ploticus/" set +u } -- cgit v1.2.3