From 8ba19dbd1fe9449e97d3ada9ec37d5e6222a6a02 Mon Sep 17 00:00:00 2001 From: Neofytos Kolokotronis Date: Thu, 23 Feb 2017 16:23:30 +0100 Subject: [PATCH] apache-ant, uim, xplanet: moved to desktop, FS#1865 --- apache-ant/PKGBUILD | 59 +++++++++++++ apache-ant/ant_diagnostics.patch | 23 +++++ apache-ant/apache-ant.csh | 2 + apache-ant/apache-ant.sh | 3 + uim/PKGBUILD | 41 +++++++++ xplanet/PKGBUILD | 30 +++++++ xplanet/giflib5.patch | 141 +++++++++++++++++++++++++++++++ 7 files changed, 299 insertions(+) create mode 100644 apache-ant/PKGBUILD create mode 100644 apache-ant/ant_diagnostics.patch create mode 100644 apache-ant/apache-ant.csh create mode 100644 apache-ant/apache-ant.sh create mode 100644 uim/PKGBUILD create mode 100644 xplanet/PKGBUILD create mode 100644 xplanet/giflib5.patch diff --git a/apache-ant/PKGBUILD b/apache-ant/PKGBUILD new file mode 100644 index 000000000..e2b0d5e33 --- /dev/null +++ b/apache-ant/PKGBUILD @@ -0,0 +1,59 @@ +# +# Platform Packages for Chakra, part of chakra-project.org +# +# maintainer (x86_64): Manuel Tortosa + + +pkgname=apache-ant +pkgver=1.9.3 +pkgrel=1 +pkgdesc="A java-based build tool." +arch=('x86_64') +license=('APACHE') +url="http://ant.apache.org/" +depends=('java-runtime') +optdepends=('junit: to have junit on the classpath in javac tasks') +source=("http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2" + "${pkgname}.sh" + "${pkgname}.csh") +md5sums=('6e6d888140858f3926c34081c4bd2227' + '593ee6ebd9b8ec321534a028e686880f' + '475b684eb8202c09cbb51496cd8ee1e0') + +package() { + # install profile.d scripts + install -d -m755 "${pkgdir}/etc/profile.d" + install -m755 "${srcdir}/${pkgname}".{csh,sh} "${pkgdir}/etc/profile.d" + + # Get the ANT_HOME env var + source "${srcdir}/${pkgname}.sh" + + cd "${srcdir}/${pkgname}-${pkgver}" + install -d -m755 "${pkgdir}/${ANT_HOME}"/{bin,lib} + + install -m644 ./lib/*.jar "${pkgdir}/${ANT_HOME}/lib" + cp -Rp ./etc "${pkgdir}/${ANT_HOME}" + + # Do not copy Windows .bat/.cmd files + find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 \{\} "${pkgdir}/${ANT_HOME}/bin" \; + + # symlink the "ant" executable to /usr/bin as well + install -d -m755 "${pkgdir}/usr/bin" + ln -s "${ANT_HOME}/bin/ant" "${pkgdir}/usr/bin/ant" + + # symlink to junit so it's on the javac build path for ant + ln -sf /usr/share/java/junit.jar "${pkgdir}/usr/share/java/apache-ant/lib" + + # fix python2 path + sed -e 's|/usr/bin/python|/usr/bin/python2|' \ + -i "${pkgdir}/usr/share/java/apache-ant/bin/runant.py" + + # The license says the NOTICE file should be redistributed for derivative + # works, so lets supply it. + cd "${srcdir}/${pkgname}-${pkgver}" + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE NOTICE "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# vim:set ts=2 sw=2 et: diff --git a/apache-ant/ant_diagnostics.patch b/apache-ant/ant_diagnostics.patch new file mode 100644 index 000000000..615089edb --- /dev/null +++ b/apache-ant/ant_diagnostics.patch @@ -0,0 +1,23 @@ +--- a/src/main/org/apache/tools/ant/Diagnostics.java ++++ b/src/main/org/apache/tools/ant/Diagnostics.java +@@ -179,7 +179,10 @@ + * @param clazz the class to get the information from. + * @since Ant 1.8.0 + */ +- private static URL getClassLocation(Class clazz) { ++ private static URL getClassLocation(Class clazz) { ++ if (clazz.getProtectionDomain().getCodeSource() == null) { ++ return null; ++ } + return clazz.getProtectionDomain().getCodeSource().getLocation(); + } + +@@ -241,7 +244,7 @@ + } + Transformer transformer = null; + try { +- transformer = transformerFactory.newTransformer(); ++ transformer = transformerFactory.newTransformer(); + } catch (Exception e) { + // ignore + ignoreThrowable(e); diff --git a/apache-ant/apache-ant.csh b/apache-ant/apache-ant.csh new file mode 100644 index 000000000..b6a6d5840 --- /dev/null +++ b/apache-ant/apache-ant.csh @@ -0,0 +1,2 @@ +setenv ANT_HOME /usr/share/java/apache-ant +setenv PATH ${PATH}:${ANT_HOME}/bin diff --git a/apache-ant/apache-ant.sh b/apache-ant/apache-ant.sh new file mode 100644 index 000000000..ab602fb28 --- /dev/null +++ b/apache-ant/apache-ant.sh @@ -0,0 +1,3 @@ +export ANT_HOME=/usr/share/java/apache-ant +export PATH=$PATH:$ANT_HOME/bin + diff --git a/uim/PKGBUILD b/uim/PKGBUILD new file mode 100644 index 000000000..fd15c6bb2 --- /dev/null +++ b/uim/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Gaetan Bisson +# Contributor: damir + +pkgname=uim +pkgver=1.8.6 +pkgrel=3 +pkgdesc='Multilingual input method library' +url='http://code.google.com/p/uim/' +license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('libxft' 'libedit' 'anthy' 'm17n-lib') +makedepends=('intltool' 'gettext' 'qt' 'kdelibs') +optdepends=('qt: immodule and helper applications' + 'gtk2: immodule and helper applications' + 'gtk3: immodules and helper applications') +source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/uim \ + --with-anthy-utf8 \ + --with-qt4-immodule \ + --with-qt4 \ + --enable-kde4-applet \ + --enable-notify=knotify4 \ + --enable-dict \ + --with-sqlite3 \ + --with-ffi + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/xplanet/PKGBUILD b/xplanet/PKGBUILD new file mode 100644 index 000000000..2e35a9247 --- /dev/null +++ b/xplanet/PKGBUILD @@ -0,0 +1,30 @@ +# Contributions from Arch: https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/xplanet + +pkgname=xplanet +pkgver=1.3.0 +pkgrel=3 +pkgdesc="An Xearth wannabe" +arch=('x86_64') +url="http://xplanet.sourceforge.net/" +license=('GPL') +depends=('pango' 'giflib' 'libtiff' 'libxss') +source=("http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz" + 'giflib5.patch') +md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' + 'c9b4504224bb5a8d6c3442fdaf1b9542') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/giflib5.patch +} + +build() { + cd "${srcdir}/$pkgname-$pkgver" + ./configure --prefix=/usr --with-freetype + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + make prefix=${pkgdir}/usr install +} diff --git a/xplanet/giflib5.patch b/xplanet/giflib5.patch new file mode 100644 index 000000000..13ff49765 --- /dev/null +++ b/xplanet/giflib5.patch @@ -0,0 +1,141 @@ +diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c +--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 ++++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 +@@ -20,7 +20,7 @@ + + #include + #include +- ++#define FALSE 0 + #include + + /* +@@ -42,11 +42,11 @@ + int color_index; + unsigned char *ptr = NULL; + +- infile = DGifOpenFileName(filename); ++ infile = DGifOpenFileName(filename, NULL); + + if (infile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -54,7 +54,7 @@ + { + if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -63,7 +63,7 @@ + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(infile) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -107,14 +107,14 @@ + GifByteType *ext; + if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + while (ext != NULL) + { + if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + } +@@ -154,7 +154,7 @@ + + free(buffer); + +- DGifCloseFile(infile); ++ DGifCloseFile(infile, NULL); + return(1); + } + +@@ -178,7 +178,7 @@ + return(0); + } + +- colormap = MakeMapObject(colormap_size, NULL); ++ colormap = GifMakeMapObject(colormap_size, NULL); + + for (i = 0; i < width * height; i++) + { +@@ -187,10 +187,10 @@ + blue[i] = (GifByteType) rgb[3*i+2]; + } + +- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, ++ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, + buffer, colormap->Colors) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -198,24 +198,24 @@ + free(green); + free(blue); + +- outfile = EGifOpenFileName((char *) filename, FALSE); ++ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); + if (outfile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -224,7 +224,7 @@ + { + if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + ptr += width; +@@ -232,8 +232,8 @@ + + EGifSpew(outfile); + +- if (EGifCloseFile(outfile) == GIF_ERROR) +- PrintGifError(); ++ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) ++ printf("%s\n", GifErrorString(GIF_ERROR)); + + free(buffer); + \ No newline at end of file