summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/java7-openjdk/PKGBUILD36
-rw-r--r--extra/pilot-link/PKGBUILD36
-rw-r--r--extra/pilot-link/pilot-link-png14.patch100
-rw-r--r--extra/qtcreator/PKGBUILD4
4 files changed, 156 insertions, 20 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 4dbfe7020..22bac7a2c 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 208914 2014-03-28 15:50:12Z guillaume $
+# $Id: PKGBUILD 210627 2014-04-16 12:11:05Z guillaume $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,19 +6,19 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.4.6
+_icedtea_ver=2.4.7
# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=51
+_JDK_UPDATE_VERSION=55
-_CORBA_CHANGESET=48ef1bb6d120
-_JAXP_CHANGESET=e0ba4b9a8b91
-_JAXWS_CHANGESET=4bd947cd146b
-_JDK_CHANGESET=b5282042aae0
-_LANGTOOLS_CHANGESET=06eeb77dac24
-_OPENJDK_CHANGESET=b028e58c1b77
+_CORBA_CHANGESET=e6ad5b912691
+_JAXP_CHANGESET=94b7e8e0d96f
+_JAXWS_CHANGESET=bd9a50a78d04
+_JDK_CHANGESET=9448fff93286
+_LANGTOOLS_CHANGESET=8c26a3c39128
+_OPENJDK_CHANGESET=13970e76b784
-_HOTSPOT_CHANGESET=172674e0ab65 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=69b542696e5b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
_bootstrap=0 # 0/1 for quick build or full bootstrap
@@ -49,14 +49,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
jre7-openjdk.profile
jre7-openjdk.profile.csh)
-sha256sums=('1f2ea0a29d946b0e8dd8f74c485adc41c02710e88c17ef827b635e1e4215ad33'
- 'e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2'
- '2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6'
- 'e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca'
- '17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a'
- 'ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5'
- 'a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477'
- '2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0'
+sha256sums=('754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1'
+ 'bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b'
+ 'cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674'
+ '3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea'
+ '3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d'
+ '9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be'
+ '5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b'
+ 'e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
diff --git a/extra/pilot-link/PKGBUILD b/extra/pilot-link/PKGBUILD
new file mode 100644
index 000000000..e153dea78
--- /dev/null
+++ b/extra/pilot-link/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 198370 2013-10-30 14:27:24Z allan $
+# Maintainer: dale <dale@archlinux.org>
+
+# todo: add perl support, DESTDIR has no affect on perl
+# and it seems that moving the files manually doesn't work
+
+pkgname=pilot-link
+pkgver=0.12.5
+pkgrel=5
+pkgdesc="A suite of tools for connecting to PalmOS handheld devices"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+depends=('readline>=6.0' 'libpng>=1.6.0' 'libusb-compat' 'popt' 'bluez-libs')
+url="http://www.pilot-link.org/"
+source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.7z{,.asc}
+ pilot-link-png14.patch)
+md5sums=('cd409c09b93654f0fc45015a7fc17b2c'
+ 'SKIP'
+ 'a21a2eeb01544a8a261a75e64a3120c3')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i "${srcdir}/pilot-link-png14.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --enable-conduits --enable-libusb \
+ --with-libiconv --with-libpng --disable-static
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/pilot-link/pilot-link-png14.patch b/extra/pilot-link/pilot-link-png14.patch
new file mode 100644
index 000000000..9d753332e
--- /dev/null
+++ b/extra/pilot-link/pilot-link-png14.patch
@@ -0,0 +1,100 @@
+diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c
+--- pilot-link-0.12.4/src/pilot-read-notepad.c 2007-02-05 00:06:02.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c 2010-01-17 15:04:33.000000000 +0100
+@@ -39,10 +39,6 @@
+
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+
+ const char *progname;
+@@ -166,8 +162,8 @@
+ width = n->body.width + 8;
+
+ png_ptr = png_create_write_struct
+- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+- png_error_ptr_NULL, png_error_ptr_NULL);
++ ( PNG_LIBPNG_VER_STRING, NULL,
++ NULL, NULL);
+
+ if(!png_ptr)
+ return;
+diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c
+--- pilot-link-0.12.4/src/pilot-read-palmpix.c 2007-02-05 00:06:03.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c 2010-01-17 15:03:20.000000000 +0100
+@@ -42,10 +42,6 @@
+
+ #ifdef HAVE_PNG
+ #include "png.h"
+-#if (PNG_LIBPNG_VER < 10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+
+ const char *progname;
+@@ -223,8 +219,8 @@
+ png_infop info_ptr;
+
+ png_ptr = png_create_write_struct
+- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+- png_error_ptr_NULL, png_error_ptr_NULL);
++ ( PNG_LIBPNG_VER_STRING, NULL,
++ NULL, NULL);
+
+ if(!png_ptr)
+ return;
+diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c
+--- pilot-link-0.12.4/src/pilot-read-screenshot.c 2006-11-02 15:54:31.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c 2010-01-17 15:03:52.000000000 +0100
+@@ -40,10 +40,6 @@
+
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-# define png_voidp_NULL (png_voidp)NULL
+-# define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -87,8 +83,8 @@
+ gray_buf = malloc( state->w );
+
+ png_ptr = png_create_write_struct
+- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+- png_error_ptr_NULL, png_error_ptr_NULL);
++ (PNG_LIBPNG_VER_STRING, NULL,
++ NULL, NULL);
+
+ if (!png_ptr)
+ return;
+diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c
+--- pilot-link-0.12.4/src/pilot-read-veo.c 2007-02-05 00:06:03.000000000 +0100
++++ pilot-link-0.12.4.png14/src/pilot-read-veo.c 2010-01-17 15:04:14.000000000 +0100
+@@ -41,10 +41,6 @@
+
+ #ifdef HAVE_PNG
+ # include "png.h"
+-# if (PNG_LIBPNG_VER < 10201)
+-# define png_voidp_NULL (png_voidp)NULL
+-# define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+
+ #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
+@@ -856,8 +852,8 @@
+ png_infop info_ptr;
+
+ png_ptr = png_create_write_struct
+- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+- png_error_ptr_NULL, png_error_ptr_NULL);
++ (PNG_LIBPNG_VER_STRING, NULL,
++ NULL, NULL);
+
+ if (!png_ptr)
+ return;
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 623abcfa8..83b091604 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,8 +7,8 @@
# Contributor: delor <bartekpiech gmail com>
pkgname=qtcreator
-pkgver=3.1.0rc1
-_pkgver=v3.1.0-rc1
+pkgver=3.1.0
+_pkgver=v3.1.0
pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')