diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-16 04:10:38 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-16 04:10:38 +0000 |
| commit | 4f73192c45f7b9615f06144dcb71f8450d39b7fb (patch) | |
| tree | cf3d6e41a808634a6b55e09464f37bea02cf4e7f | |
| parent | 85be6f08e6368a31e9f971c043b11e8c12ce6545 (diff) | |
Fri May 16 04:04:53 UTC 2014
73 files changed, 241 insertions, 3865 deletions
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD deleted file mode 100644 index 07d7531f2..000000000 --- a/community/avifile/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 99690 2013-10-30 23:02:52Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=avifile -pkgver=0.7.45 -pkgrel=9 -pkgdesc="A library that allows you to read and write compressed AVI files" -arch=('i686' 'x86_64') -depends=('qt3' 'sdl' 'freetype2' 'libpng' 'libjpeg' - 'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv') -makedepends=('lame' 'v4l-utils' 'chrpath') -url="http://avifile.sourceforge.net" -license=('GPL') -source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgver.tar.bz2" - 'gcc.patch' - 'videodev.patch') -md5sums=('7da94802f120d1b69e04a13170dcd21d' - '79a488db80c82f0abb8a83f52e3b3aa0' - '6cca050885afe85c2d98982f75f5e3b0') - -build() { - cd $pkgname-0.7-$pkgver - - patch -Np1 <$srcdir/gcc.patch - patch -Np1 <$srcdir/videodev.patch - - ./configure \ - --prefix=/usr \ - --mandir=$pkgdir/usr/share/man \ - --with-qt-prefix=/usr \ - --with-qt-includes=/usr/include/qt3 \ - --with-qt-libraries=/usr/lib \ - --enable-oss - - make -} - -package() { - cd $pkgname-0.7-$pkgver - make prefix=$pkgdir/usr install - - cd $pkgdir/usr/bin - chrpath -d avibench avicap avicat avirec kv4lsetup avimake aviplay avitype avirecompress -} diff --git a/community/avifile/gcc.patch b/community/avifile/gcc.patch deleted file mode 100644 index 078b4ae81..000000000 --- a/community/avifile/gcc.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -wbBur avifile-0.7-0.7.45/avifile.pc avifile-0.7-0.7.45.my/avifile.pc ---- avifile-0.7-0.7.45/avifile.pc 2006-03-06 12:12:26.000000000 +0300 -+++ avifile-0.7-0.7.45.my/avifile.pc 2009-05-25 13:10:17.347697640 +0400 -@@ -1,4 +1,4 @@ --prefix=/var/tmp/avi6 -+prefix=/usr - exec_prefix=${prefix} - libdir=${exec_prefix}/lib - includedir=${prefix}/include/avifile-0.7 -diff -wbBur avifile-0.7-0.7.45/include/avm_map.h avifile-0.7-0.7.45.my/include/avm_map.h ---- avifile-0.7-0.7.45/include/avm_map.h 2004-02-19 14:39:56.000000000 +0300 -+++ avifile-0.7-0.7.45.my/include/avm_map.h 2009-05-25 13:10:21.014364635 +0400 -@@ -45,7 +45,7 @@ - - template <class Key1, class Value1> struct binary_tree_node - { -- avm_map::pair<Key1, Value1>* entry; -+ struct pair<Key1, Value1>* entry; - binary_tree_node<Key1, Value1>* left; - Key1 minval; - binary_tree_node<Key1, Value1>* right; -diff -wbBur avifile-0.7-0.7.45/include/version.h avifile-0.7-0.7.45.my/include/version.h ---- avifile-0.7-0.7.45/include/version.h 2006-03-06 12:12:25.000000000 +0300 -+++ avifile-0.7-0.7.45.my/include/version.h 2009-05-25 13:10:16.841030758 +0400 -@@ -3,5 +3,5 @@ - #define AVIFILE_MINOR_VERSION 7 - #define AVIFILE_PATCHLEVEL 45 - #define AVIFILE_VERSION ((AVIFILE_MAJOR_VERSION << 16) + (AVIFILE_MINOR_VERSION << 8) + AVIFILE_PATCHLEVEL) --#define AVIFILE_BUILD "CVS-0.7.45-060306-10:11-4.0.3" -+#define AVIFILE_BUILD "RELEASE-0.7.45-090525-13:10-4.4.0" - #endif -diff -wbBur avifile-0.7-0.7.45/lib/aviplay/aviplay.cpp avifile-0.7-0.7.45.my/lib/aviplay/aviplay.cpp ---- avifile-0.7-0.7.45/lib/aviplay/aviplay.cpp 2005-11-05 00:56:33.000000000 +0300 -+++ avifile-0.7-0.7.45.my/lib/aviplay/aviplay.cpp 2009-05-25 13:13:36.304347364 +0400 -@@ -242,7 +242,7 @@ - //printf("VSTREAMTIME %f\n", m_pVideostream->GetTime()); - // reading subtitles - avm::string fn = m_Filename; -- char* p = strrchr(fn.c_str(), '.'); -+ char* p = (char*)strrchr(fn.c_str(), '.'); - if (p) - *p = 0; - InitSubtitles(m_Subfilename.size() -diff -wbBur avifile-0.7-0.7.45/lib/codeckeeper.cpp avifile-0.7-0.7.45.my/lib/codeckeeper.cpp ---- avifile-0.7-0.7.45/lib/codeckeeper.cpp 2004-03-10 16:27:38.000000000 +0300 -+++ avifile-0.7-0.7.45.my/lib/codeckeeper.cpp 2009-05-25 13:15:11.971004390 +0400 -@@ -143,7 +143,7 @@ - { - char plgn[100]; - strcpy(plgn, "avm_codec_plugin_"); -- char* x = strrchr(name, '/'); -+ char* x = (char*)strrchr(name, '/'); - strncat(plgn, x + 1, 50); - x = strchr(plgn, '.'); - *x = 0; -diff -wbBur avifile-0.7-0.7.45/lib/common/Args.cpp avifile-0.7-0.7.45.my/lib/common/Args.cpp ---- avifile-0.7-0.7.45/lib/common/Args.cpp 2003-02-06 23:39:12.000000000 +0300 -+++ avifile-0.7-0.7.45.my/lib/common/Args.cpp 2009-05-25 13:14:38.562055811 +0400 -@@ -17,7 +17,7 @@ - { - char* c = cp; - char* b; -- while ((b = strchr(c, ':'))) -+ while ((b = (char*)strchr(c, ':'))) - { - *b++ = 0; - if (strlen(c)) -@@ -259,7 +259,7 @@ - } - for (unsigned i = 0; i < arr.size(); i++) - { -- char* par = strchr(arr[i], '='); -+ char* par = (char*)strchr(arr[i], '='); - if (par) - { - *par = 0; -@@ -335,7 +335,7 @@ - { - for (unsigned j = 1; j < arr.size(); j++) - { -- char* p = strchr(arr[j].c_str(), '='); -+ char* p = (char*)strchr(arr[j].c_str(), '='); - int val = 0; - bool valid = false; - if (p) -diff -wbBur avifile-0.7-0.7.45/player/playercontrol.cpp avifile-0.7-0.7.45.my/player/playercontrol.cpp ---- avifile-0.7-0.7.45/player/playercontrol.cpp 2005-09-27 17:40:09.000000000 +0400 -+++ avifile-0.7-0.7.45.my/player/playercontrol.cpp 2009-05-25 13:16:18.274330659 +0400 -@@ -764,7 +764,7 @@ - return; - - avm::string path = RS("url", "."); -- char* cut = strrchr(path.c_str(), '/'); -+ char* cut = (char*)strrchr(path.c_str(), '/'); - if (!cut) - path = "./"; - #if QT_VERSION <= 220 -diff -wbBur avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp avifile-0.7-0.7.45.my/plugins/libmp3lame_audioenc/mp3encoder.cpp ---- avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp 2006-03-05 23:45:26.000000000 +0300 -+++ avifile-0.7-0.7.45.my/plugins/libmp3lame_audioenc/mp3encoder.cpp 2009-05-25 13:10:21.014364635 +0400 -@@ -30,7 +30,7 @@ - short nCodecDelay; - }; - public: -- MP3Encoder::MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format) -+ MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format) - :IAudioEncoder(info) - { - in_fmt=*format; -diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp ---- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp 2005-03-23 18:18:21.000000000 +0300 -+++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp 2009-05-25 13:10:21.014364635 +0400 -@@ -229,7 +229,7 @@ - if (XF86DGAQueryExtension(dpy, &foo, &bar)) { - XF86DGAQueryDirectVideo(dpy, XDefaultScreen(dpy),&flags); - if (flags & XF86DGADirectPresent) { -- XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(int*)&base,&width,&foo,&bar); -+ XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(unsigned int*)&base,&width,&foo,&bar); - set_bpl = width * set_bpp/8; - set_base = base; - if (verbose == 2) { -diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.cpp ---- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp 2005-03-23 19:16:09.000000000 +0300 -+++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.cpp 2009-05-25 13:10:21.014364635 +0400 -@@ -1115,7 +1115,7 @@ - major,minor, XDGA_MAJOR_VERSION,XDGA_MINOR_VERSION); - have_dga= false; - } else { -- XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int*)&base, &width, &bank, &ram); -+ XF86DGAGetVideoLL(disp, DefaultScreen(disp), (unsigned int*)&base, &width, &bank, &ram); - if (!base) - avml(AVML_WARN, - "v4l1: can not allocate frame buffer base: %p\n", base); -diff -wbBur avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.45.my/lib/aviread/AsfNetworkInputStream.cpp ---- avifile-0.7-0.7.45.org/lib/aviread/AsfNetworkInputStream.cpp 2004-10-25 14:15:38.000000000 +0400 -+++ avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp 2012-08-28 13:26:33.000000000 +0400 -@@ -937,7 +937,7 @@ - } - - asf_packet* p; -- unsigned short& size = chhdr.size; -+ uint16_t size = chhdr.size; - //printf("STREAMPACKET 0x%x sz:%d %lld seq:%d part:%d sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm); - switch (chhdr.kind) - { diff --git a/community/avifile/videodev.patch b/community/avifile/videodev.patch deleted file mode 100644 index 0729c8ab9..000000000 --- a/community/avifile/videodev.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -wbBur avifile-0.7-0.7.45/acinclude.m4 avifile-0.7-0.7.45.my/acinclude.m4 ---- avifile-0.7-0.7.45/acinclude.m4 2006-03-06 12:11:19.000000000 +0300 -+++ avifile-0.7-0.7.45.my/acinclude.m4 2011-11-17 13:20:52.000000000 +0400 -@@ -1158,7 +1158,7 @@ - AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], - [], enable_v4l=yes) - if test x$enable_v4l = xyes; then -- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) -+ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) - fi - - if test x$enable_v4l = xyes; then -diff -wbBur avifile-0.7-0.7.45/configure avifile-0.7-0.7.45.my/configure ---- avifile-0.7-0.7.45/configure 2006-03-06 12:11:32.000000000 +0300 -+++ avifile-0.7-0.7.45.my/configure 2011-11-17 13:20:47.000000000 +0400 -@@ -27667,8 +27667,8 @@ - fi; - if test x$enable_v4l = xyes; then - if test "${ac_cv_header_linux_videodev_h+set}" = set; then -- echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 --echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 -+echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 - if test "${ac_cv_header_linux_videodev_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -@@ -27676,8 +27676,8 @@ - echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6 - else - # Is the header compilable? --echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5 --echo $ECHO_N "checking linux/videodev.h usability... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking libv4l1-videodev.h usability" >&5 -+echo $ECHO_N "checking libv4l1-videodev.h usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27685,7 +27685,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -27720,15 +27720,15 @@ - echo "${ECHO_T}$ac_header_compiler" >&6 - - # Is the header present? --echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5 --echo $ECHO_N "checking linux/videodev.h presence... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking libv4l1-videodev.h presence" >&5 -+echo $ECHO_N "checking libv4l1-videodev.h presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -27762,25 +27762,25 @@ - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------------ ## -@@ -27791,8 +27791,8 @@ - sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 --echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 -+echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 - if test "${ac_cv_header_linux_videodev_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c ---- avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c 2006-02-04 11:57:34.000000000 +0300 -+++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c 2011-11-17 13:21:12.000000000 +0400 -@@ -23,7 +23,7 @@ - #include <sys/mman.h> - #include <sys/time.h> - #define _LINUX_TIME_H 1 --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <time.h> - - typedef struct { -diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c ---- avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c 2006-03-02 00:36:52.000000000 +0300 -+++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c 2011-11-17 13:29:40.000000000 +0400 -@@ -31,7 +31,8 @@ - #include <sys/mman.h> - #include <sys/time.h> - #define _LINUX_TIME_H 1 --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#include <linux/videodev2.h> - #include <time.h> - - static const int desired_video_buffers = 256; -diff -wbBur avifile-0.7-0.7.45/m4/v4l.m4 avifile-0.7-0.7.45.my/m4/v4l.m4 ---- avifile-0.7-0.7.45/m4/v4l.m4 2004-02-18 23:53:58.000000000 +0300 -+++ avifile-0.7-0.7.45.my/m4/v4l.m4 2011-11-17 13:20:56.000000000 +0400 -@@ -10,7 +10,7 @@ - AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], - [], enable_v4l=yes) - if test x$enable_v4l = xyes; then -- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) -+ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) - fi - - if test x$enable_v4l = xyes; then -diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp ---- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp 2005-03-23 18:18:21.000000000 +0300 -+++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp 2011-11-17 13:29:34.000000000 +0400 -@@ -39,7 +39,7 @@ - - /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #ifndef X_DISPLAY_MISSING - #include <X11/Xlib.h> -diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h ---- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h 2003-11-14 19:42:04.000000000 +0300 -+++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h 2011-11-17 13:35:57.000000000 +0400 -@@ -32,7 +32,8 @@ - - /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - - #define V4L_DEVICE "/dev/video" - #define V4L_VBI_DEVICE "/dev/vbi" diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD index e9b4f9a87..cd9621cff 100644 --- a/community/delegate/PKGBUILD +++ b/community/delegate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $ +# $Id: PKGBUILD 111221 2014-05-15 14:30:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=delegate -pkgver=9.9.7 -pkgrel=3 +pkgver=9.9.8 +pkgrel=1 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface" arch=('i686' 'x86_64') url="http://www.delegate.org/" @@ -13,7 +13,7 @@ depends=('pam') options=(!strip) install=delegate.install source=(ftp://ftp:ps790809%40inbox%2Eru@ftp.delegate.org/pub/DeleGate/delegate$pkgver.tar.gz) -md5sums=('86c833e95cd16a54d54fa3c7e4ab7929') +md5sums=('db78957f3a8183a4df6cd047984d5900') build() { cd $srcdir/$pkgname$pkgver diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 9b8855c66..45a4e1f29 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 108978 2014-04-08 15:15:47Z thestinger $ +# $Id: PKGBUILD 111175 2014-05-15 14:13:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> # Contributor: Daniel Micay <danielmicay@gmail.com> pkgname=freeradius -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -18,7 +18,7 @@ install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} freeradius.tmpfiles freeradius.service) -md5sums=('c6b25a532e65ce6bfef4f422b7240d4d' +md5sums=('6093be8d2a962035d6b1111789b3447c' 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' 'e3f18e3a25df3b692e59f60605354708') diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 4870394b9..d55cef05b 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109898 2014-04-21 10:42:07Z spupykin $ +# $Id: PKGBUILD 111177 2014-05-15 14:13:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,14 +6,14 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.8.6 +pkgver=1.5.9.0 pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz") -md5sums=('0df62707961248869477c58f6c7d7605') +md5sums=('b5b64887b48843e47641ebcf146f5ec7') prepare() { cd "${srcdir}/gmic-${pkgver}" diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 77850f59f..747528c6f 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106888 2014-03-09 13:16:31Z andrea $ +# $Id: PKGBUILD 111179 2014-05-15 14:14:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.8 +pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ @@ -20,15 +20,8 @@ optdepends=('recordmydesktop: screen capture' 'cdrkit: dvd iso image creation') install=kdenlive.install options=('docs') -source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2 - "FS37617.patch::http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=d049b327afc02b499266b5c895b13e438490b7c0&o=plain") -md5sums=('3bd3a511b860490acc367e7c9d7ffa43' - '672edd6399a4d5e80937f61547490038') - -prepare() { - cd ${srcdir}/kdenlive-${pkgver} - patch -p1 <$srcdir/FS37617.patch -} +source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) +md5sums=('589801ff79c5819936141abe7e4f44fc') build() { export LDFLAGS="$LDFLAGS -lX11" diff --git a/community/kleansweep/ChangeLog b/community/kleansweep/ChangeLog deleted file mode 100644 index d8e35c402..000000000 --- a/community/kleansweep/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com> -* Added libtool option diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD deleted file mode 100644 index c6783590d..000000000 --- a/community/kleansweep/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 77134 2012-10-05 11:29:08Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Guillermo A. Amaral <me@guillermoamaral.com> - -pkgname=kleansweep -pkgver=0.2.9 -pkgrel=6 -pkgdesc="Allows you to reclaim disk space by finding unneeded files" -license=("GPL") -url="http://linux.bydg.org/~yogin/" -arch=(i686 x86_64) -depends=('kdelibs3') -makedepends=('scons') -options=('libtool') -#source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz -source=(http://arch.p5n.pp.ru/~sergej/dl/2011/kleansweep-$pkgver.tar.gz - kubuntu_03_fix_scons_chmod_error.patch) -md5sums=('25fea364644590acd23fe766506e0b92' - 'bebb833313fc184848b5fef77a7cb310') - -build() { - cd $srcdir/$pkgname-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/kubuntu_03_fix_scons_chmod_error.patch - [ $NOEXTRACT -eq 1 ] || ./configure - scons - scons install DESTDIR=$pkgdir -} diff --git a/community/kleansweep/kubuntu_03_fix_scons_chmod_error.patch b/community/kleansweep/kubuntu_03_fix_scons_chmod_error.patch deleted file mode 100644 index 4e6495016..000000000 --- a/community/kleansweep/kubuntu_03_fix_scons_chmod_error.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' kleansweep-0.2.9/admin/generic.py kleansweep-0.2.9.new/admin/generic.py ---- kleansweep-0.2.9/admin/generic.py 2008-02-15 02:59:29.000000000 +0100 -+++ kleansweep-0.2.9.new/admin/generic.py 2008-02-15 03:00:49.278304972 +0100 -@@ -244,7 +244,8 @@ - ret=self.env.Program(self.p_localtarget, self.p_localsource) - if not self.env.has_key('NOAUTOINSTALL'): - ins=self.env.bksys_install(self.instdir, ret) -- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms)) -+ if ins and self.perms: -+ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms)) - elif self.type=='staticlib': - ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource) - -@@ -462,7 +463,8 @@ - if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files)) - elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files)) - else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files)) -- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms)) -+ if perms and install_list: -+ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms)) - env.Alias('install', install_list) - return install_list - diff --git a/community/kovpn/ChangeLog b/community/kovpn/ChangeLog deleted file mode 100644 index d8e35c402..000000000 --- a/community/kovpn/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com> -* Added libtool option diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD deleted file mode 100644 index ddf9128d6..000000000 --- a/community/kovpn/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 90051 2013-05-06 19:38:01Z foutrelis $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> - -pkgname=kovpn -pkgver=0.3pre7 -_pkgver=0.3.pre7 -pkgrel=7 -pkgdesc="An OpenVPN client management interface for KDE" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php?content=37043" -license=('GPL') -depends=('openvpn' 'kdelibs3' 'xdg-utils') -makedepends=('automake' 'autoconf') -options=('libtool') -install=kovpn.install -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" - "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") -md5sums=('19b61cf9f84088baffbd5bb0a287422c' - '21171b74f76289daea1cc61eedaa4dba') - -build() { - cd $srcdir/$pkgname-$_pkgver - - unset LDFLAGS - export QTDIR=/usr - export QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++ - - patch -Np1 -i ../kovpn-disable-dcop.patch - sed -i "s#automake\*1.10\*#automake*`pacman -Q automake | cut -f2 -d\ |cut -f1-2 -d.`*#" admin/cvs.sh - sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADER#g' admin/{cvs.sh,configure.in.min} - make -f admin/Makefile.common cvs - ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt - make -} - -package() { - cd $srcdir/$pkgname-$_pkgver - make prefix=$pkgdir/usr install -} diff --git a/community/kovpn/kovpn.install b/community/kovpn/kovpn.install deleted file mode 100644 index b4ee8556f..000000000 --- a/community/kovpn/kovpn.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - diff --git a/community/ktechlab/PKGBUILD b/community/ktechlab/PKGBUILD deleted file mode 100644 index ac59910d6..000000000 --- a/community/ktechlab/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 58604 2011-11-16 15:28:16Z spupykin $ -# Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com> - -pkgname=ktechlab -pkgver=0.3.7 -pkgrel=3 -pkgdesc="IDE for electronic circuits and microcontrollers" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/ktechlab" -license=("GPL") -depends=('kdelibs3' 'gputils' 'gpsim') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "$pkgname-gcc45.patch::http://patch-tracker.debian.org/patch/series/dl/ktechlab/0.3.7-10/40-gcc-4.5.patch") -md5sums=('8e778ef8ce6d0dd4539f5532c933f6bf' - '126a04255a8288a7ee42fe47a81c0079') - -build() { - . /etc/profile.d/qt3.sh - cd "${srcdir}/${pkgname}-$pkgver" - patch -p1 <$srcdir/$pkgname-gcc45.patch - ./configure --prefix=/opt/kde \ - --disable-debug \ - --without-arts - make -} - -package() { - cd "${srcdir}/${pkgname}-$pkgver" - make DESTDIR="${pkgdir}" install -} diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD deleted file mode 100644 index 821b7c1e1..000000000 --- a/community/madman/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 104837 2014-01-27 10:33:49Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: Hugo Ideler <hugoideler@dse.nl> -# Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> - -pkgname=madman -pkgver=0.94beta1.20080906 -pkgrel=1 -pkgdesc="I-tunes like music player" -arch=('i686' 'x86_64') -url="http://madman.sourceforge.net/" -license=('GPL') -depends=('qt3' 'xmms' 'gtk' 'taglib') -makedepends=('python2' 'scons' 'git') -source=(git+http://git.tiker.net/trees/madman.git - ftp://ftp.archlinux.org/other/community/madman/madman.desktop - ftp://ftp.archlinux.org/other/community/madman/madman_logo.png - ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png - ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png - fake-g++.sh) -md5sums=('SKIP' - '591354b69235d5a4b5a09591d04db266' - 'd4546f77857a6ccdabb2036eb6a0da07' - '2d54bb8eceed283edc88a3e4553d2483' - '3c2da1b1800fb372e225ae38fa1398e8' - '685a6fb13c861b82950dd6a77fd02120') - -prepare() { - cd $srcdir/$pkgname - mkdir -p ,build/release/designer - touch ,build/release/designer/tsonglistview.h \ - ,build/release/designer/tsetlistview.h \ - ,build/release/designer/tclickablelabel.h \ - ,build/release/designer/tacceleratorlineedit.h \ - ,build/release/designer/tsonglistview.h \ - ,build/release/designer/tsetlistview.h - sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag -} - -build() { - cd $srcdir/$pkgname - echo -e '\n\n' | ./configure - install -m755 $srcdir/fake-g++.sh ./g++ - export PATH=.:$PATH - scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 -} - -package() { - cd $srcdir/$pkgname - - scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \ - install_to=$pkgdir/usr prefix=/usr install - - install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png - install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png - install -Dm644 $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large/madman_logo_large.png - install -Dm644 $srcdir/madman.desktop $pkgdir/usr/share/applications/madman.desktop -} diff --git a/community/madman/fake-g++.sh b/community/madman/fake-g++.sh deleted file mode 100644 index af424f5ca..000000000 --- a/community/madman/fake-g++.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -x - -Q=`echo "$*" | sed 's|- p t h r e a d|-pthread|'` -echo "$Q" | grep 'lmp4ff' && Q="$Q /usr/lib/libmp4ff.a" -exec /usr/bin/g++ $Q diff --git a/community/mandvd/PKGBUILD b/community/mandvd/PKGBUILD deleted file mode 100644 index 3519ac8dd..000000000 --- a/community/mandvd/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 87997 2013-04-09 21:40:35Z eric $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> -# Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com> - -pkgname=mandvd -pkgver=2.6 -pkgrel=2 -pkgdesc="A program to simply create DVD Video" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php/ManDVD?content=83906" -license=('GPL') -depends=('dvd+rw-tools>=5.21.4' 'dvd-slideshow>=0.7.5' 'mjpegtools>=1.8.0' 'mplayer' 'qt3' 'xine-ui>=0.99.4') -changelog=$pkgname.changelog -source=(http://vectorlinux.osuosl.org/veclinux-7.0/source/abs/xap/$pkgname/$pkgname-$pkgver-1.fc12.tar.gz) -sha256sums=('967fd66da31f0619001b3aaea494ab41579ab7ffdc6a1b0a51a4a4add012eb9c') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - qmake-qt3 - sed -i "s|O2|O1|" ./Makefile - sed -i 's|-I$(QTDIR)/include|-I/usr/include/qt3|' Makefile - sed -i '55 i\#include <unistd.h>' main.cpp - sed -i '28 i\#include <unistd.h>' mandvd.cpp - make QTDIR=/usr MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - install -D -m755 $pkgname ${pkgdir}/usr/bin/$pkgname - -# Creating menu item - install -D -m644 mandvdico.png ${pkgdir}/usr/share/pixmaps/$pkgname.png - install -D -m644 $pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop -} diff --git a/community/mandvd/mandvd.changelog b/community/mandvd/mandvd.changelog deleted file mode 100644 index 90b4038b0..000000000 --- a/community/mandvd/mandvd.changelog +++ /dev/null @@ -1,10 +0,0 @@ -2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mandvd 2.6-2 - * package signed and FS#27067 fixed - -2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mandvd 2.6-1 - * new upstream release - -2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.5 diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index adb1067cd..27e6363d2 100644 --- a/community/mcabber/PKGBUILD +++ b/community/mcabber/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99907 2013-10-31 02:24:20Z allan $ +# $Id: PKGBUILD 111181 2014-05-15 14:14:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: 3ED <kas1987@o2.pl> pkgname=mcabber -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="A small Jabber console client, includes features: SSL, PGP, MUC, UTF8" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr3' 'aspell') makedepends=('pkg-config') source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2) -md5sums=('6bb2302f5168ad4c28b647390e37f9b3') +md5sums=('f6b0a075ba678de15af0129653a553da') build() { cd "${srcdir}"/$pkgname-${pkgver/_/-} diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index a55cffb5e..fc09c4561 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107384 2014-03-17 09:31:23Z spupykin $ +# $Id: PKGBUILD 111231 2014-05-15 14:32:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" @@ -16,7 +16,7 @@ source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" "mediaproxy-dispatcher.service" "mediaproxy-relay.service" "mediaproxy.tmpfiles") -md5sums=('726610cf1ee4a3a9855b8cd6adf85502' +md5sums=('72443d6137c77c3c9cd446ca98ec5d21' '4a1fa0b6ce0a8bd44bf0f1d9d36a6154' '23c1a584835de00a958ef963cdd40040' '60a25f2cb6429a0a7d62d45d0c75a0ea') diff --git a/community/mingw-w64-binutils/PKGBUILD b/community/mingw-w64-binutils/PKGBUILD index 28ba518b0..a377f7fc6 100644 --- a/community/mingw-w64-binutils/PKGBUILD +++ b/community/mingw-w64-binutils/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 104091 2014-01-15 13:38:18Z spupykin $ +# $Id: PKGBUILD 111257 2014-05-15 15:10:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-binutils -pkgver=2.23.2 -pkgrel=3 +pkgver=2.24 +pkgrel=1 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils" @@ -14,20 +14,11 @@ license=('GPL') groups=('mingw-w64-toolchain' 'mingw-w64') depends=('zlib') options=('!libtool' '!emptydirs') -source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz" - "windres.patch::https://bugs.archlinux.org/task/38111?getfile=11313" - "binutils-2.23.2-texinfo-5.0.patch.txt") -md5sums=('cda9dcc08c86ff2fd3f27e4adb250f6f' - '2b653bdfd2ddda9ff36b4695b2d9bc8c' - '34e439ce23213a91e2af872dfbb5094c') +source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz") +md5sums=('a5dd5dd2d212a282cc1d4a84633e0d88') prepare() { cd ${srcdir}/binutils-${pkgver} - # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 - # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 - patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch.txt - patch -p1 -i ${srcdir}/windres.patch - #do not install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" @@ -42,7 +33,8 @@ build() { --target=${_target} \ --infodir=/usr/share/info/${_target} \ --enable-lto --enable-plugins \ - --disable-multilib --disable-nls + --disable-multilib --disable-nls \ + --disable-werror make done } diff --git a/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt b/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt deleted file mode 100644 index 38dc19fb0..000000000 --- a/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo -index 45ffa73..3aa3300 100644 ---- a/bfd/doc/bfd.texinfo -+++ b/bfd/doc/bfd.texinfo -@@ -322,7 +324,7 @@ All of BFD lives in one directory. - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -333,7 +335,7 @@ All of BFD lives in one directory. - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye -diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi -index 56a0510..fb1802b 100644 ---- a/binutils/doc/binutils.texi -+++ b/binutils/doc/binutils.texi -@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''. - * objcopy:: Copy and translate object files - * objdump:: Display information from object files - * ranlib:: Generate index to archive contents --* readelf:: Display the contents of ELF format files - * size:: List section sizes and total size - * strings:: List printable strings from files - * strip:: Discard symbols --* elfedit:: Update the ELF header of ELF files - * c++filt:: Filter to demangle encoded C++ symbols - * cxxfilt: c++filt. MS-DOS name for c++filt - * addr2line:: Convert addresses to file and line - * nlmconv:: Converts object code into an NLM --* windres:: Manipulate Windows resources - * windmc:: Generator for Windows message resources -+* windres:: Manipulate Windows resources - * dlltool:: Create files needed to build and use DLLs -+* readelf:: Display the contents of ELF format files -+* elfedit:: Update the ELF header of ELF files - * Common Options:: Command-line options for all utilities - * Selecting the Target System:: How these utilities determine the target - * Reporting Bugs:: Reporting Bugs -@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}. - @c man end - @end ignore - --@node c++filt, addr2line, elfedit, Top -+@node c++filt, addr2line, strip, Top - @chapter c++filt - - @kindex c++filt -@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach}, - - @table @env - --@itemx --input-mach=@var{machine} -+@item --input-mach=@var{machine} - Set the matching input ELF machine type to @var{machine}. If - @option{--input-mach} isn't specified, it will match any ELF - machine types. -@@ -4392,21 +4392,21 @@ machine types. - The supported ELF machine types are, @var{L1OM}, @var{K1OM} and - @var{x86-64}. - --@itemx --output-mach=@var{machine} -+@item --output-mach=@var{machine} - Change the ELF machine type in the ELF header to @var{machine}. The - supported ELF machine types are the same as @option{--input-mach}. - --@itemx --input-type=@var{type} -+@item --input-type=@var{type} - Set the matching input ELF file type to @var{type}. If - @option{--input-type} isn't specified, it will match any ELF file types. - - The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. - --@itemx --output-type=@var{type} -+@item --output-type=@var{type} - Change the ELF file type in the ELF header to @var{type}. The - supported ELF types are the same as @option{--input-type}. - --@itemx --input-osabi=@var{osabi} -+@item --input-osabi=@var{osabi} - Set the matching input ELF file OSABI to @var{osabi}. If - @option{--input-osabi} isn't specified, it will match any ELF OSABIs. - -@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD}, - @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, - @var{NSK}, @var{AROS} and @var{FenixOS}. - --@itemx --output-osabi=@var{osabi} -+@item --output-osabi=@var{osabi} - Change the ELF OSABI in the ELF header to @var{osabi}. The - supported ELF OSABI are the same as @option{--input-osabi}. - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index c7ae2a5..4777ad5 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''. - @ifset ARM - * ARM:: ld and the ARM family - @end ifset --@ifset HPPA --* HPPA ELF32:: ld and HPPA 32-bit ELF --@end ifset - @ifset M68HC11 - * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families - @end ifset -+@ifset HPPA -+* HPPA ELF32:: ld and HPPA 32-bit ELF -+@end ifset - @ifset M68K - * M68K:: ld and Motorola 68K family - @end ifset -@@ -6012,6 +6014,9 @@ functionality are not listed. - @ifset I960 - * i960:: @command{ld} and the Intel 960 family - @end ifset -+@ifset M68HC11 -+* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families -+@end ifset - @ifset ARM - * ARM:: @command{ld} and the ARM family - @end ifset -@@ -6027,9 +6032,6 @@ functionality are not listed. - @ifset MSP430 - * MSP430:: @command{ld} and MSP430 - @end ifset --@ifset M68HC11 --* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families --@end ifset - @ifset POWERPC - * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support - @end ifset -@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye --- -1.7.1 - diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD index 559f9443f..30093b524 100644 --- a/community/miniupnpd/PKGBUILD +++ b/community/miniupnpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110046 2014-04-23 15:59:45Z tredaelli $ +# $Id: PKGBUILD 111172 2014-05-15 09:51:25Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: fauno <fauno@parabola.nu> pkgname=miniupnpd -pkgver=1.8.20140401 -pkgrel=2 +pkgver=1.8.20140422 +pkgrel=1 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" @@ -14,7 +14,7 @@ makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd-1.8.20140401-foreground.patch miniupnpd.systemd) -sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd' +sha256sums=('2980c7dbcdf00d6942ad21c814d88a3c70996b550a8e229eb52362bd472c3961' '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e' 'baac6223eb35729ea301bd658dc2df6aad5396c7c0b1ec15c8aac1803ef37f6a') diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 952dc6e6b..2dcb6aae9 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105350 2014-02-05 20:04:46Z bluewind $ +# $Id: PKGBUILD 111165 2014-05-15 02:14:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -8,7 +8,7 @@ # to the depends and delete "no-g15" in the configure line below pkgname=mumble -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A voice chat application similar to TeamSpeak" @@ -18,8 +18,16 @@ makedepends=('boost' 'mesa') #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support') install=mumble.install url="http://mumble.sourceforge.net/" -source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz") -md5sums=('084ca44252bd5356b68af555f81ba6f6') +source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" +"gcc49.patch::https://github.com/mumble-voip/mumble/commit/349436284b5f1baa61836c98ff0d518392140c5d.patch") +md5sums=('32b37ff426863d7abeb1b7c1938652ff' + 'ca344e0c4a33f1cbff2de94c60112a45') + +prepare() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 < $srcdir/gcc49.patch +} build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/openvswitch/PKGBUILD b/community/openvswitch/PKGBUILD index d7f88b1d0..0744a8164 100644 --- a/community/openvswitch/PKGBUILD +++ b/community/openvswitch/PKGBUILD @@ -1,44 +1,27 @@ -# $Id: PKGBUILD 110682 2014-05-05 09:14:44Z spupykin $ +# $Id: PKGBUILD 111252 2014-05-15 14:55:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Pedro Martinez-Julia (pedromj@um.es) # Contributor: Matt Monaco <net 0x01b dgbaley27> pkgname=openvswitch pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Production Quality, Multilayer Open Virtual Switch" url="http://openvswitch.org" license=('APACHE') arch=(x86_64 i686) install=openvswitch.install source=("http://openvswitch.org/releases/openvswitch-$pkgver.tar.gz" - openvswitch.install openvswitch.tmpfiles ovsdb-server.service ovs-vswitchd.service) depends=('openssl') makedepends=('python2') optdepends=('python2') -sha256sums=('014907bcf2f98228dfa4472ea1547871d24b8fb8192dcfff3ead1af93c433a67' - '9d30ed859214f4cdeb6b6450d5c5defaf31f2c593c05201109df66fa9373ef0c' - 'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9' - '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657' - 'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45') -sha256sums=('a032fcc3becd98802b4816488cb3a2441b6b88b510ec28a929e756f948eb48c0' - '9d30ed859214f4cdeb6b6450d5c5defaf31f2c593c05201109df66fa9373ef0c' - 'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9' - '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657' - 'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45') -sha256sums=('43f228ac145f682a7c6681bae7b9bee004fcdd9d4a4503d87ca65c0e9fe1a04b' - '9d30ed859214f4cdeb6b6450d5c5defaf31f2c593c05201109df66fa9373ef0c' - 'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9' - '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657' - 'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45') -sha256sums=('875429b052c4001815b6cb38616c7a6cb212df4bba74602164ee0a99b172079b' - '9d30ed859214f4cdeb6b6450d5c5defaf31f2c593c05201109df66fa9373ef0c' - 'e8dc21e50fc886bfd6aa55991bdb3cb66907e11b071045452bb12de01a3ecbd9' - '5900728bca0292ec66e6da234eaa6f32f28ead6bda163d89a480eac08558c657' - 'c2cb5e2685240ea50b1aba4e77784f4dd66d157e7cd05a17853868aa8d8a2a45') +md5sums=('430ff6d1e1fc81e9c5ebc2e641cfc953' + '0534c19ed27d2ff8c6b32d87c07bc76f' + '69b29d231bcc3002528fd29f1f78a37f' + 'c5338742b6667f7be611176afe209230') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/openvswitch/openvswitch.install b/community/openvswitch/openvswitch.install index a64353d02..b9ee27005 100644 --- a/community/openvswitch/openvswitch.install +++ b/community/openvswitch/openvswitch.install @@ -1,14 +1,12 @@ post_install() { - if [[ ! -f etc/openvswitch/conf.db ]]; then - cmd=(ovsdb-tool create etc/openvswitch/conf.db usr/share/openvswitch/vswitch.ovsschema) - printf "Running: %s\n" "${cmd[*]}" "${cmd[@]}" fi + systemd-tmpfiles --create openvswitch.conf } post_upgrade() { diff --git a/community/perl-datetime-format-mail/PKGBUILD b/community/perl-datetime-format-mail/PKGBUILD index cb5bacb73..f629a9c1e 100644 --- a/community/perl-datetime-format-mail/PKGBUILD +++ b/community/perl-datetime-format-mail/PKGBUILD @@ -2,16 +2,16 @@ # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime-format-mail -pkgver=0.3001 -pkgrel=8 +pkgver=0.401 +pkgrel=1 pkgdesc="Convert between DateTime and RFC2822/822 formats " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime-Format-Mail" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0' 'perl-datetime' 'perl-params-validate>=0.67') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Mail-$pkgver.tar.gz) -md5sums=('15e36249e866463bd0237262a8e43b16') +source=("http://search.cpan.org/CPAN/authors/id/B/BO/BOOK/DateTime-Format-Mail-$pkgver.tar.gz") +md5sums=('98f4d4d9dc17af5dcb3b3c79314ccc96') build() { cd $srcdir/DateTime-Format-Mail-$pkgver diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index e6b3320e4..7d6dd042c 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110688 2014-05-05 09:15:39Z spupykin $ +# $Id: PKGBUILD 111183 2014-05-15 14:14:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=1.09 +pkgver=1.10 pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('5bd3b4145ea08df1af71f2e8979ca178') +md5sums=('2dccc83565dfffef50611acaa50f0426') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 54100cf32..c485b8dc5 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91682 2013-05-26 09:25:34Z bluewind $ +# $Id: PKGBUILD 111199 2014-05-15 14:16:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-io-tty -pkgver=1.10 -pkgrel=3 +pkgver=1.11 +pkgrel=1 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/IO-Tty/" @@ -12,7 +12,7 @@ license=("GPL" "PerlArtistic") depends=('glibc') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/IO-Tty-$pkgver.tar.gz") -md5sums=('46baec86a145e57f0ec661fa412b097c') +md5sums=('fc42736aee83f848ff5191c6890cc539') build() { cd $srcdir/IO-Tty-$pkgver diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 33881b8f7..5e690c007 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94191 2013-07-16 14:53:18Z spupykin $ +# $Id: PKGBUILD 111203 2014-05-15 14:17:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=1.08 +pkgver=1.10 pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'perl-module-implementation') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('5edfb0ffd92cbb0e2646ddf23d4516e9') +md5sums=('be70733a36b5e941da8c985b664e4028') build() { cd Params-Validate-${pkgver} diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 0a1992429..f0730c5b4 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 108468 2014-03-27 14:48:03Z fyan $ +# $Id: PKGBUILD 111209 2014-05-15 14:17:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.5.2 -pkgrel=2 +pkgver=2.5.3 +pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64') url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) -md5sums=('53d81793fbab8fee6e732a0425d50047') +md5sums=('09dcec70f623a9ef774f1aef75690995') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 9aa4bc195..870add721 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110411 2014-04-29 11:37:39Z spupykin $ +# $Id: PKGBUILD 111211 2014-05-15 14:18:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.19.12 +pkgver=1.19.13 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-${pkgver/_/}.tar.gz") -md5sums=('5f688d48a574c142bb7e9c6606b5c6f6') +md5sums=('b8a670e182e9671e25ec9a493d8452a1') build() { cd "$srcdir/$pkgname-${pkgver/_/}" diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD deleted file mode 100644 index 4476268c9..000000000 --- a/community/ruby-gtk2/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 104888 2014-01-28 03:34:19Z td123 $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Eric Bélanger <eric@archlinux.org> -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgbase=ruby-gtk2 -pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' - 'ruby-pango') -pkgver=2.1.0 -pkgrel=2 -arch=('x86_64' 'i686') -url='http://ruby-gnome2.sourceforge.jp/' -license=('LGPL') -makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') - -prepare() { - cd "ruby-gtk2-$pkgver" - - LANG="en_US.UTF-8" \ - ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor - mkdir -p \ - "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ - "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ - "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ - "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ - "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ - "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ - "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" -} - -build() { - make -C "ruby-gtk2-$pkgver" -} - -package_ruby-atk() { - pkgdesc='Ruby bindings for atk' - depends=("ruby-glib2=$pkgver" 'atk') - - cd "$srcdir/ruby-gtk2-$pkgver/atk" - make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 -} - -package_ruby-gdkpixbuf2() { - pkgdesc='Ruby bindings for gdkpixbuf2' - depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') - - cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 -} - -package_ruby-gio2() { - pkgdesc='Ruby bindings for gio2' - depends=("ruby-glib2=$pkgver") - - cd "$srcdir/ruby-gtk2-$pkgver/gio2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 -} - -package_ruby-glib2() { - pkgdesc='Ruby bindings for glib2' - depends=('glib2' 'ruby') - - cd "$srcdir/ruby-gtk2-$pkgver/glib2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 -} - -package_ruby-gtk2() { - pkgdesc='Ruby bindings for gtk2' - depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" - "ruby-gdkpixbuf2=$pkgver") - - cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 -} - -package_ruby-pango() { - pkgdesc='Ruby bindings for pango' - depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') - - cd "$srcdir/ruby-gtk2-$pkgver/pango" - make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 -} - -# vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD deleted file mode 100644 index 4051be99e..000000000 --- a/community/ruby-gtk3/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 104889 2014-01-28 03:34:19Z td123 $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Eric Bélanger -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgbase=ruby-gtk3 -pkgver=2.1.0 -pkgrel=2 -pkgname=('ruby-gtk3' 'ruby-gdk3') -depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") -arch=('x86_64' 'i686') -url='http://ruby-gnome2.sourceforge.jp/' -license=('LGPL') -makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('436844cc9ab3bf5e5a3027e3276fc69ff9cae5cff88bc60179c416050d5e753d') - -prepare() { - cd "$srcdir/ruby-gtk3-$pkgver" - - LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor -} - -build() { - cd "$srcdir/ruby-gtk3-$pkgver" - make -} - -package_ruby-gtk3() { - pkgdesc='Ruby bindings for gtk3' - depends=('gtk3' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" - "ruby-gdkpixbuf2=$pkgver" "ruby-gdk3=$pkgver") - - cd "$srcdir/ruby-gtk3-$pkgver/gtk3" - mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" - make DESTDIR="$pkgdir/" install -j1 -} - -package_ruby-gdk3() { - pkgdesc='Ruby bindings for gdk3' - depends=('ruby' 'gtk3') - - cd "$srcdir/ruby-gtk3-$pkgver/gdk3" - mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux" - make DESTDIR="$pkgdir/" install -j1 -} - -# vim:set ts=2 sw=2 et: diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD index 091687396..79c049be2 100644 --- a/community/squashfs-tools/PKGBUILD +++ b/community/squashfs-tools/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $ +# $Id: PKGBUILD 111215 2014-05-15 14:18:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Original TU: Jeff Mickey <j@codemac.net> # Contributor: ciccio.a pkgname=squashfs-tools -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64') depends=('zlib' 'lzo2' 'xz') source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz") -md5sums=('1b7a781fb4cf8938842279bd3e8ee852') +md5sums=('d92ab59aabf5173f2a59089531e30dbf') build() { cd ${srcdir}/squashfs${pkgver}/${pkgname} diff --git a/community/tesseract-game/PKGBUILD b/community/tesseract-game/PKGBUILD new file mode 100644 index 000000000..f0da99a3d --- /dev/null +++ b/community/tesseract-game/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 111260 2014-05-15 21:20:00Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: portals <portals at riseup.net> +# Contributor: novemberist +# Contributor: PyroDevil +# Contributor: giacomogiorgianni@gmail.com + +pkgname=tesseract-game +pkgver=1 +pkgrel=1 +pkgdesc='Smooth FPS with map editing, instagib, DM and CTF' +url='http://tesseract.gg/' +arch=('x86_64' 'i686') +license=('ZLIB') +depends=('libgl' 'sdl2' 'sdl2_image' 'sdl2_mixer' 'libpng' 'mesa' 'zlib') +makedepends=('subversion' 'gendesk' 'imagemagick') +source=('tesseract::svn://svn.tuxfamily.org/svnroot/tesseract/main#revision=1678' + 'tesseract_large.png::http://upload.wikimedia.org/wikipedia/commons/5/50/Truncated_tesseract_stereographic_%28tC%29.png' + 'tesseract.sh') +md5sums=('SKIP' + '3f7098fad57081bb1af0ee4771e20ad3' + 'ab00bafb80c1c7764cba8f51120d4a9a') + +prepare() { + gendesk -n -f --pkgname tesseract --pkgdesc "$pkgdesc" + convert -transparent white -resize 48x48 tesseract_large.png tesseract.png 2> /dev/null +} + +build() { + make -C tesseract/src +} + +package() { + cd tesseract + make -C src install + install -d "$pkgdir/usr/share/tesseract-game/" + cp -R media/ config/ "$pkgdir/usr/share/tesseract-game" + install -Dm755 bin_unix/native_client "$pkgdir/usr/bin/tesseract-client" + install -Dm755 bin_unix/native_server "$pkgdir/usr/bin/tesseract-server" + install -Dm644 src/readme_tesseract.txt "$pkgdir/usr/share/licenses/tesseract-game/LICENSE" + install -Dm755 ../tesseract.sh "$pkgdir/usr/bin/tesseract-game" + install -Dm644 ../tesseract.desktop "$pkgdir/usr/share/applications/tesseract.desktop" + install -Dm644 ../tesseract.png "$pkgdir/usr/share/pixmaps/tesseract.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/tesseract-game/tesseract.sh b/community/tesseract-game/tesseract.sh new file mode 100644 index 000000000..896d571fc --- /dev/null +++ b/community/tesseract-game/tesseract.sh @@ -0,0 +1,6 @@ +#!/bin/sh +TESS_BIN=/usr/bin/ +TESS_DATA=/usr/share/tesseract-game/ +TESS_OPTIONS="-u$HOME/.tesseract" +cd "$TESS_DATA" +exec "$TESS_BIN/tesseract-client" "$TESS_OPTIONS" "$@" diff --git a/community/tork/PKGBUILD b/community/tork/PKGBUILD deleted file mode 100644 index fe8a4121b..000000000 --- a/community/tork/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 103134 2013-12-27 05:36:23Z fyan $ -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: Darwin Bautista <djclue917@gmail.com> -# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> - -_libname=tor -pkgname=${_libname}k -pkgver=0.33 -pkgrel=5 -pkgdesc="An anonymity manager for KDE" -arch=("i686" "x86_64") -url="http://sourceforge.net/projects/$pkgname/" -license=("GPL") -depends=("geoip" "kdelibs3" "${_libname}" "torsocks" "hicolor-icon-theme" "desktop-file-utils" "xdg-utils") -optdepends=("privoxy: For anonymous browsing with Konqueror") -options=("!emptydirs") -install=${pkgname}.install - -source=( - http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - fix_net_port.patch - fix_getuid.patch -) -sha1sums=( - 'cf94b9579cf24254fcb344f579088a241bbd4028' - '70c450031bf5e603801451fc016e5cfc22cfd19c' - '9fe1de823850e6a0d0a4a18c3b86955206f544bd' -) - -build() { - cd ${pkgname}-${pkgver} - - # Source the KDE and QT profiles - source /etc/profile.d/kde3.sh - #source /etc/profile.d/qt3.sh - - msg "Applying patch(es) ..." - - patch -Np1 -i ../fix_net_port.patch - patch -Np1 -i ../fix_getuid.patch - - # Build - msg "Compiling tork ..." - ./configure --prefix=/opt/kde --mandir=/usr/share/man \ - --sysconfdir=/etc --with-external-geoip --without-arts - - # Fix --as-needed and --hash-style=gnu options not recognized error - find . -name Makefile -exec sed -i "s/-Wl,//g" {} \; - find . -name Makefile -exec sed -i "s/-Wl//g" {} \; - find . -name Makefile -exec sed -i "s/--hash-style=gnu,//g" {} \; - find . -name Makefile -exec sed -i "s/--hash-style=gnu//g" {} \; - find . -name Makefile -exec sed -i "s/--as-needed,//g" {} \; - find . -name Makefile -exec sed -i "s/--as-needed//g" {} \; - - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/tork/fix_getuid.patch b/community/tork/fix_getuid.patch deleted file mode 100644 index 6afdae74a..000000000 --- a/community/tork/fix_getuid.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- A/src/tork.h 2009-08-13 03:41:23.000000000 +0800 -+++ B/src/tork.h 2012-04-04 22:43:55.924940588 +0800 -@@ -45,6 +45,9 @@ - #include <kpopupmenu.h> - #include <qvaluevector.h> - -+#include <unistd.h> -+#include <sys/types.h> -+ - #include "update.h" - #include "trayicon.h" - #include "upnpmanager.h" ---- A/src/likeback.h 2006-10-01 19:58:11.000000000 +0800 -+++ B/src/likeback.h 2012-04-04 22:50:38.024921928 +0800 -@@ -22,6 +22,8 @@ - #define LIKEBACK_H - - #include <qobject.h> -+#include <unistd.h> -+#include <sys/types.h> - - class KConfig; - class KAboutData; diff --git a/community/tork/fix_net_port.patch b/community/tork/fix_net_port.patch deleted file mode 100644 index b5545e0b2..000000000 --- a/community/tork/fix_net_port.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- A/src/upnp/upnprouter.h -+++ B/src/upnp/upnprouter.h -@@ -242,7 +242,7 @@ - * @param port The local port to forward - */ - void forward(const net::Port & externalport, -- const net::Port & internalport = net::Port::Port(), -+ const net::Port & internalport = net::Port(), - bool force = false); - - /** -@@ -291,7 +291,7 @@ - bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false ); - bool verbose; - -- void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port::Port()); -+ void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port()); - void undoForward(UPnPService* srv,const net::Port & externalport,const net::Port & - internalport,bt::WaitJob* waitjob); - void httpRequestDone(bt::HTTPRequest* r,bool erase_fwd); diff --git a/community/tork/tork.install b/community/tork/tork.install deleted file mode 100644 index 5c501dc49..000000000 --- a/community/tork/tork.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index 88162a474..ad0dabba5 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110184 2014-04-25 23:44:06Z dwallace $ +# $Id: PKGBUILD 111170 2014-05-15 03:12:20Z svenstaro $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -12,6 +12,7 @@ pkgname=(uwsgi uwsgi-plugin-psgi uwsgi-plugin-python2 uwsgi-plugin-python + uwsgi-plugin-pypy uwsgi-plugin-nagios uwsgi-plugin-router uwsgi-plugin-php @@ -24,7 +25,7 @@ pkgname=(uwsgi #uwsgi-plugin-erlang #uwsgi-plugin-admin pkgver=2.0.4 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) @@ -32,7 +33,7 @@ backup=('etc/uwsgi/emperor.ini') conflicts=(python-$pkgbase) makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7 - jansson classpath) + jansson classpath pypy) source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz archlinux.ini tmpfilesd @@ -76,6 +77,7 @@ build() { python2 uwsgiconfig.py --plugin plugins/python archlinux python2 python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent + python2 uwsgiconfig.py --plugin plugins/pypy archlinux pypy } package_uwsgi() { @@ -144,6 +146,15 @@ package_uwsgi-plugin-python(){ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} } +package_uwsgi-plugin-pypy(){ + depends=(pypy uwsgi-plugin-common) + pkgdesc="Plugin for PyPy support" + install -dm755 $pkgdir/usr/bin + cd $srcdir/$pkgbase-$pkgver + install -Dm755 $srcdir/$pkgbase-$pkgver/pypy_plugin.so $pkgdir/usr/lib/uwsgi/pypy_plugin.so + ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} +} + package_uwsgi-plugin-nagios(){ depends=( uwsgi-plugin-common) pkgdesc="Plugin for Nagios support" diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD deleted file mode 100644 index c7a4ddebd..000000000 --- a/community/vyqchat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 110076 2014-04-23 17:29:50Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=vyqchat -pkgver=0.2.8 -pkgrel=5 -pkgdesc="vypress compatible qt chat (can work without server)" -arch=('i686' 'x86_64') -url="http://linux.bydg.org/~yogin/" -license=('GPL') -depends=('qt3' 'libao' 'libxi') -source=(http://www.uic.unn.ru/~soed/programs/chat/$pkgname-$pkgver.tar.gz - build-fix.patch) -md5sums=('67974bc5df1ed0d63785d04325444d4f' - 'de3af70da3743c27929f04f72c837412') - -build() { - cd $srcdir/$pkgname-${pkgver} - patch -Np1 <../build-fix.patch - # Use _LDADD to properly compile with --as-needed - sed -i 's/vyqchat_LDFLAGS/vyqchat_LDADD/' src/Makefile.am - # Correct acinclude.m4 to avoid empty else block - sed -i 's:# Leave bnv_qt_lib_dir defined:/bin/true:' acinclude.m4 - autoreconf -fiv - ./configure --prefix=/usr --with-Qt-bin-dir=/usr/lib/qt3/bin --with-Qt-include-dir=/usr/include/qt3 --with-Qt-lib-dir=/usr/lib - make -} - -package() { - cd $srcdir/$pkgname-${pkgver} - make DESTDIR=$pkgdir install -} diff --git a/community/vyqchat/build-fix.patch b/community/vyqchat/build-fix.patch deleted file mode 100644 index 7ad70ab2f..000000000 --- a/community/vyqchat/build-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -wbBur vyqchat-0.2.8/src/settings.h vyqchat-0.2.8.my/src/settings.h ---- vyqchat-0.2.8/src/settings.h 2005-07-18 22:54:08.000000000 +0400 -+++ vyqchat-0.2.8.my/src/settings.h 2007-02-21 21:05:11.000000000 +0300 -@@ -88,7 +88,7 @@ - - // - // Get methods -- const UUID& Settings::getUUID() const { return uuid; } -+ const UUID& getUUID() const { return uuid; } - const QString& getIconThemeName() const { return icontheme; } - const QString& getNick() const { return nick; } - char getGender() const { return gender; } -diff -wbBur vyqchat-0.2.8/src/sound.h vyqchat-0.2.8.my/src/sound.h ---- vyqchat-0.2.8/src/sound.h 2005-07-18 22:54:08.000000000 +0400 -+++ vyqchat-0.2.8.my/src/sound.h 2007-02-21 21:04:45.000000000 +0300 -@@ -47,7 +47,7 @@ - bool reload_samples(Settings &settings); - static bool init(Settings *settings); - static void close(); -- static const QString& Sound::error(); -+ static const QString& error(); - static void play(VyEvent evt); - }; - -diff -wbBur vyqchat-0.2.8/src/user.h vyqchat-0.2.8.my/src/user.h ---- vyqchat-0.2.8/src/user.h 2005-07-18 23:03:01.000000000 +0400 -+++ vyqchat-0.2.8.my/src/user.h 2007-02-21 21:04:14.000000000 +0300 -@@ -38,7 +38,7 @@ - } - return false; - } -- bool User::setStatus(char s) { status=s; return true; } -+ bool setStatus(char s) { status=s; return true; } - void setNick(const QString &nick) { setText(nick); } - int incDeadCounter() { if (dcnt<1) dcnt++; return dcnt; } - int decDeadCounter() { return --dcnt; } diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index 714f6127d..738cfee1d 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 107191 2014-03-14 08:53:43Z spupykin $ +# $Id: PKGBUILD 111217 2014-05-15 14:18:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: sracker <smb.sac@gmail.com> pkgname=xdebug -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('php') backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz xdebug.ini) -md5sums=('a2edd77f112ab47286c280df041c396a' +md5sums=('7e571ce8eb6fa969fd8263969019849d' '6a1f2ef91c632d4c9b7b218cd2e278ef') build() { diff --git a/core/efivar/PKGBUILD b/core/efivar/PKGBUILD index 01ce62370..315ebe897 100644 --- a/core/efivar/PKGBUILD +++ b/core/efivar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211194 2014-04-18 10:46:53Z tpowa $ +# $Id: PKGBUILD 212787 2014-05-15 06:54:54Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> # Contributor : Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> pkgname="efivar" pkgdesc="Tools and library to manipulate EFI variables" -pkgver="0.8" +pkgver="0.10" pkgrel="1" arch=('x86_64' 'i686') url="https://github.com/vathpela/efivar" @@ -31,6 +31,7 @@ prepare() { echo sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/efivar/src/test/Makefile" || true + sed 's|-O0|-Os|g' -i "${srcdir}/efivar/Make.defaults" || true } diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 8134224ec..abe50c21a 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 210563 2014-04-14 22:14:41Z thomas $ +# $Id: PKGBUILD 212847 2014-05-15 17:38:41Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow -pkgver=4.1.5.1 -pkgrel=9 +pkgver=4.2.1 +pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -18,7 +18,7 @@ backup=(etc/login.defs etc/default/useradd) options=(strip debug) install='shadow.install' -source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig} +source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.xz"{,.sig} LICENSE chgpasswd chpasswd @@ -31,7 +31,7 @@ source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz xstrdup.patch shadow-strncpy-usage.patch lastlog.tmpfiles) -sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' +sha1sums=('0917cbadd4ce0c7c36670e5ecd37bbed92e6d82d' 'SKIP' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' @@ -47,32 +47,31 @@ sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' '21e12966a6befb25ec123b403cd9b5c492fe5b16' 'f57ecde3f72b4738fad75c097d19cf46a412350f') -build() { +prepare() { cd "$pkgname-$pkgver" - # avoid transitive linking issues with binutils 2.22 - sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - - # link to glibc's crypt(3) - export LIBS="-lcrypt" - # need to offer these upstream patch -Np1 <"$srcdir/xstrdup.patch" patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in + sed -i '/^SUBDIRS/s/pam\.d//' etc/Makefile.in +} + +build() { + cd "$pkgname-$pkgver" ./configure \ + LIBS="-lcrypt" \ --prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/bin \ - --libdir=/lib \ + --libdir=/usr/lib \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --with-libpam \ - --without-selinux \ - --with-group-name-max-length=32 + --with-group-name-max-length=32 \ + --without-selinux make } @@ -89,10 +88,10 @@ package() { install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" # systemd timer - install -D -m644 ${srcdir}/shadow.timer ${pkgdir}/usr/lib/systemd/system/shadow.timer - install -D -m644 ${srcdir}/shadow.service ${pkgdir}/usr/lib/systemd/system/shadow.service - install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants - ln -s ../shadow.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/shadow.timer + install -D -m644 "$srcdir/shadow.timer" "$pkgdir/usr/lib/systemd/system/shadow.timer" + install -D -m644 "$srcdir/shadow.service" $pkgdir/usr/lib/systemd/system/shadow.service + install -d -m755 "$pkgdir/usr/lib/systemd/system/multi-user.target.wants" + ln -s ../shadow.timer "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/shadow.timer" # login.defs install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" @@ -111,7 +110,7 @@ package() { done # lastlog log file creation - install -Dm644 "$srcdir/lastlog.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/lastlog.conf" + install -Dm644 "$srcdir/lastlog.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/lastlog.conf" # Remove evil/broken tools rm "$pkgdir"/usr/sbin/logoutd diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index ed8eac791..5c442ab0a 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198641 2013-10-31 16:48:15Z bisson $ +# $Id: PKGBUILD 212820 2014-05-15 14:29:12Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=11 +pkgrel=12 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -13,14 +13,13 @@ options=('!emptydirs') depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' - 'qt3: qt3 bindings' 'qt4: qt4 bindings' 'pygtk: avahi-bookmarks, avahi-discover' 'twisted: avahi-bookmarks' 'mono: mono bindings' 'python2-dbus: avahi-discover' 'nss-mdns: NSS support for mDNS') -makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus' +makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus' 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman') backup=('etc/avahi/hosts' 'etc/avahi/avahi-daemon.conf' @@ -46,7 +45,6 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - export MOC_QT3=/usr/bin/moc-qt3 export MOC_QT4=/usr/bin/moc-qt4 export PYTHON=/usr/bin/python2 @@ -56,6 +54,7 @@ build() { --localstatedir=/var \ --sbindir=/usr/bin \ --disable-monodoc \ + --disable-qt3 \ --enable-compat-libdns_sd \ --enable-compat-howl \ --with-distro=archlinux \ diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index 5d7e91ce0..f449f1785 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212004 2014-05-04 13:54:04Z td123 $ +# $Id: PKGBUILD 212771 2014-05-15 04:27:19Z td123 $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: @@ -11,7 +11,7 @@ pkgname=ghc pkgver=7.8.2 -pkgrel=3 +pkgrel=4 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') url='http://www.haskell.org/ghc/' diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 7fc765918..c596b78be 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 211255 2014-04-18 11:39:13Z heftig $ +# $Id: PKGBUILD 212853 2014-05-15 20:32:21Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64) @@ -20,7 +20,7 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz nm-libexecdir.patch) -sha256sums=('d5a475f390d992de03ccf8ffeafec90595da700594eba9fc0688cbb1652b5516' +sha256sums=('3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71' 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD deleted file mode 100644 index e4b58b8f2..000000000 --- a/extra/kdelibs3/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 200735 2013-12-03 18:03:09Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kdelibs3 -pkgver=3.5.10 -pkgrel=19 -pkgdesc='KDE3 Core Libraries' -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' - 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates' 'xorg-iceauth') -makedepends=('cups' 'hspell' 'optipng') -optdepends=('hspell: for Hebrew spell-checking support') -options=('libtool' 'staticlibs' '!makeflags') -source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" - 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' - 'acinclude.patch' - 'kde3.profile' - 'kde4-compatibility.patch' - 'kconf_updaterc' - 'openssl.patch' - 'kdelibs3-missing-include.patch' - 'kdelibs3-cups16.patch') -sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' - 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' - '50c9de71b102507fb78b192ecc22a5fc3e031bc3' - 'd63d51c8fef5e521b4a9a8efa050a0c8ce6f94bf' - '5fbbf7a5e2032878815fa055bfb5020f478d2b25' - '35e56fe4c5f71685e64b13f448dcacc620166e06' - '50e92950498463defb9149ffcf8cbc2e8cd1063b' - 'e5f5b8c060a2db9cedb82bf18caadfa869921779' - '6a6c544b3336bfe89bb17ef737d783a7ec006c6c') - -prepare() { - cd kdelibs-${pkgver} - patch -p0 -i "$srcdir"/kde-3.5-1074156.patch - patch -p1 -i "$srcdir"/acinclude.patch - patch -p1 -i "$srcdir"/kde4-compatibility.patch - patch -p1 -i "${srcdir}"/openssl.patch - patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch - patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch - pushd pics/crystalsvg - optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png cr22-app-password.png \ - cr16-filesys-folder_green{,_open}.png cr32-action-today.png - popd - optipng -quiet -force -fix interfaces/kimproxy/library/icons/cr48-action-presence_offline.png -} - -build() { - cd kdelibs-${pkgver} - ./configure --prefix=/opt/kde --with-distribution='Arch Linux' \ - --with-alsa --disable-dnssd --disable-dnotify \ - --enable-inotify --enable-sendfile --with-hspell \ - --enable-gcc-hidden-visibility --enable-final \ - --without-arts --without-lua --disable-libfam - make -} - -package() { - cd kdelibs-${pkgver} - - make DESTDIR="$pkgdir" install - -# disable broken kconf_update by default - install -D -m644 "$srcdir"/kconf_updaterc "$pkgdir"/opt/kde/share/config/kconf_updaterc - -# install KDE3 profile - install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh -# make KDE3 styles available to Qt3 - install -d -m755 "$pkgdir"/usr/lib/qt3/plugins - ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/usr/lib/qt3/plugins/styles - -# cert bundle seems to be hardcoded -# link it to the one from ca-certificates - ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - -# we don't have khelpcenter anyway - rm -rf "$pkgdir"/opt/kde/share/doc - - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf -} diff --git a/extra/kdelibs3/acinclude.patch b/extra/kdelibs3/acinclude.patch deleted file mode 100644 index 0610d6df5..000000000 --- a/extra/kdelibs3/acinclude.patch +++ /dev/null @@ -1,66 +0,0 @@ -2009-12-10 Stepan Kasal <skasal@redhat.com> - -The change of implementation of AC_REQUIRE in 2.64 caused a regression -in the arts project. -This can be fixed by shuffling some macro calls. - -I suppose that most of this patch will not be needed with a future -release of Autoconf. -But the last chunk of this patch is a real bug in this source and -should go upstream. - ---- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 -+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 -@@ -3081,8 +3081,18 @@ - fi - ]) - -+AC_DEFUN([AC_CHECK_COMPILERS_CC], -+[ -+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -+ CFLAGS=" $CFLAGS" -+ AC_PROG_CC -+ CXXFLAGS=" $CXXFLAGS" -+ AC_PROG_CXX -+]) -+ - AC_DEFUN([AC_CHECK_COMPILERS], - [ -+ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), - [ -@@ -3141,11 +3151,6 @@ - [kde_use_profiling="no"] - ) - -- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS -- CFLAGS=" $CFLAGS" -- -- AC_PROG_CC -- - AC_PROG_CPP - - if test "$GCC" = "yes"; then -@@ -3174,10 +3179,6 @@ - LDFLAGS="" - fi - -- CXXFLAGS=" $CXXFLAGS" -- -- AC_PROG_CXX -- - KDE_CHECK_FOR_BAD_COMPILER - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then -@@ -3503,8 +3504,8 @@ - AC_REQUIRE([AC_LIBTOOL_DLOPEN]) - AC_REQUIRE([KDE_CHECK_LIB64]) - --AC_OBJEXT --AC_EXEEXT -+AC_REQUIRE([AC_OBJEXT]) -+AC_REQUIRE([AC_EXEEXT]) - - AM_PROG_LIBTOOL - AC_LIBTOOL_CXX diff --git a/extra/kdelibs3/kconf_updaterc b/extra/kdelibs3/kconf_updaterc deleted file mode 100644 index 24c2623fb..000000000 --- a/extra/kdelibs3/kconf_updaterc +++ /dev/null @@ -1,2 +0,0 @@ -updateInfoAdded=false -autoUpdateDisabled=true diff --git a/extra/kdelibs3/kde3.profile b/extra/kdelibs3/kde3.profile deleted file mode 100755 index 61e7c43ca..000000000 --- a/extra/kdelibs3/kde3.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/opt/kde/bin diff --git a/extra/kdelibs3/kde4-compatibility.patch b/extra/kdelibs3/kde4-compatibility.patch deleted file mode 100644 index 129c314ae..000000000 --- a/extra/kdelibs3/kde4-compatibility.patch +++ /dev/null @@ -1,1012 +0,0 @@ -diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp ---- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 -+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 -@@ -158,7 +158,7 @@ - int i = 0; - - // argument 0 has to be drkonqi -- argv[i++] = "drkonqi"; -+ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; - - #if defined Q_WS_X11 - // start up on the correct display -@@ -325,7 +325,7 @@ - _exit(253); - if(!geteuid() && setuid(getuid()) < 0) - _exit(253); -- execvp("drkonqi", const_cast< char** >( argv )); -+ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); - _exit(errno); - } - else -diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am ---- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 -@@ -58,7 +58,7 @@ - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) - --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update -diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in ---- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 -@@ -535,7 +535,7 @@ - - servicetype_DATA = kdedmodule.desktop - servicetypedir = $(kde_servicetypesdir) --xdg_menu_DATA = applications.menu -+xdg_menu_DATA = kde-applications.menu - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update - #>- all: all-am -@@ -1173,7 +1173,7 @@ - -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc - - #>+ 2 --KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am -+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am - - #>+ 2 - docs-am: -diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu ---- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 -@@ -1,469 +0,0 @@ -- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -- --<Menu> -- <Name>Applications</Name> -- <Directory>kde-main.directory</Directory> -- <!-- Search the default locations --> -- <KDELegacyDirs/> -- <DefaultAppDirs/> -- <DefaultDirectoryDirs/> -- <DefaultLayout> -- <Merge type="menus"/> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </DefaultLayout> -- <Layout> -- <Merge type="menus"/> -- <Menuname>Applications</Menuname> -- <Merge type="files"/> -- </Layout> -- -- <Menu> -- <Name>Applications</Name> -- <Directory>kde-unknown.directory</Directory> -- <OnlyUnallocated/> -- <Include> -- <Not> -- <!-- Don't list non-KDE core applications --> -- <And> -- <Category>Core</Category> -- <Not><Category>KDE</Category></Not> -- </And> -- <!-- Don't list SUSE's YaST in here --> -- <Category>X-SuSE-YaST</Category> -- </Not> -- </Include> -- </Menu> -- <Menu> -- <Name>Development</Name> -- <Directory>kde-development.directory</Directory> -- <Menu> -- <Name>X-KDE-KDevelopIDE</Name> -- <Directory>kde-development-kdevelop.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>X-KDE-KDevelopIDE</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Translation</Name> -- <Directory>kde-development-translation.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>Translation</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Web Development</Name> -- <Directory>kde-development-webdevelopment.directory</Directory> -- <Include> -- <And> -- <Category>Development</Category> -- <Category>WebDevelopment</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Development</Category> -- <Not><Category>X-KDE-KDevelopIDE</Category></Not> -- <Not><Category>Translation</Category></Not> -- <Not><Category>WebDevelopment</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-science.directory</Directory> -- <Include> -- <And><!-- Include /any/ Science app which is not an Education app --> -- <Or> -- <Category>Astronomy</Category> -- <Category>Biology</Category> -- <Category>Chemistry</Category> -- <Category>Geology</Category> -- <Category>MedicalSoftware</Category> -- <Category>Physics</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- </Or> -- <Not><Category>Education</Category></Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Edutainment</Name> -- <Directory>kde-edutainment.directory</Directory> -- <Menu> -- <Name>Languages</Name> -- <Directory>kde-edu-languages.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Mathematics</Name> -- <Directory>kde-edu-mathematics.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Math</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Miscellaneous</Name> -- <Directory>kde-edu-miscellaneous.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Not> -- <Category>Languages</Category> -- <Category>X-KDE-Edu-Language</Category> -- <Category>Math</Category> -- <Category>Science</Category> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Not> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Science</Name> -- <Directory>kde-edu-science.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Category>Science</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Tools</Name> -- <Directory>kde-edu-tools.directory</Directory> -- <Include> -- <And> -- <Category>Education</Category> -- <Or> -- <Category>Teaching</Category> -- <Category>X-KDE-Edu-Teaching</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Games</Name> -- <Directory>kde-games.directory</Directory> -- <Menu> -- <Name>Arcade</Name> -- <Directory>kde-games-arcade.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>ArcadeGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Board</Name> -- <Directory>kde-games-board.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>BoardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Card</Name> -- <Directory>kde-games-card.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>CardGame</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Kidsgames</Name> -- <Directory>kde-games-kids.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Or> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- </Or> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>TacticStrategy</Name> -- <Directory>kde-games-strategy.directory</Directory> -- <Include> -- <And> -- <Category>Game</Category> -- <Category>StrategyGame</Category> -- </And> -- </Include> -- </Menu> -- <Include> -- <And> -- <Category>Game</Category> -- <Not> -- <Category>ArcadeGame</Category> -- <Category>BoardGame</Category> -- <Category>CardGame</Category> -- <Category>X-KDE-KidsGame</Category> -- <Category>KidsGame</Category> -- <Category>StrategyGame</Category> -- </Not> -- </And> -- </Include> -- <Menu> -- <Name>Toys</Name> -- <Directory>kde-toys.directory</Directory> -- <Include> -- <Category>Amusement</Category> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Graphics</Name> -- <Directory>kde-graphics.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Graphics</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Internet</Name> -- <Directory>kde-internet.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-internet-terminal.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Network</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Multimedia</Name> -- <Directory>kde-multimedia.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>AudioVideo</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Office</Name> -- <Directory>kde-office.directory</Directory> -- <Layout> -- <Merge type="menus"/> -- <Filename>kde-koshell.desktop</Filename> -- <Filename>kde-Kontact.desktop</Filename> -- <Separator/> -- <Filename>kde-kword.desktop</Filename> -- <Filename>kde-kspread.desktop</Filename> -- <Filename>kde-kpresenter.desktop</Filename> -- <Merge type="files"/> -- <Separator/> -- <Menuname>More</Menuname> -- </Layout> -- <Include> -- <And> -- <Category>Office</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Office</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Menu> -- <Name>Settingsmenu</Name> -- <Directory>kde-settingsmenu.directory</Directory> -- <Include> -- <Category>Settings</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>System</Name> -- <Directory>kde-system.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>System</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>ScreenSavers</Name> -- <Directory>kde-system-screensavers.directory</Directory> -- </Menu> -- <Menu> -- <Name>Terminal</Name> -- <Directory>kde-system-terminal.directory</Directory> -- </Menu> -- </Menu> -- <Menu> -- <Name>Utilities</Name> -- <Directory>kde-utilities.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Not><Category>Accessibility</Category></Not> -- <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -- <Not><Category>X-KDE-Utilities-File</Category></Not> -- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -- <Not><Category>X-KDE-Utilities-PIM</Category></Not> -- <Not><Category>X-KDE-More</Category></Not> -- </And> -- </Include> -- <Menu> -- <Name>Accessibility</Name> -- <Directory>kde-utilities-accessibility.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>Accessibility</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Desktop</Name> -- <Directory>kde-utilities-desktop.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Desktop</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Editors</Name> -- <Directory>kde-editors.directory</Directory> -- <Include> -- <Category>TextEditor</Category> -- </Include> -- </Menu> -- <Menu> -- <Name>File</Name> -- <Directory>kde-utilities-file.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-File</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>Peripherals</Name> -- <Directory>kde-utilities-peripherals.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-Peripherals</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>PIM</Name> -- <Directory>kde-utilities-pim.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-Utilities-PIM</Category> -- </And> -- </Include> -- </Menu> -- <Menu> -- <Name>XUtilities</Name> -- <Directory>kde-utilities-xutils.directory</Directory> -- </Menu> -- <Menu> -- <Name>More</Name> -- <Directory>kde-more.directory</Directory> -- <Include> -- <And> -- <Category>Utility</Category> -- <Category>X-KDE-More</Category> -- </And> -- </Include> -- </Menu> -- </Menu> -- <Include> -- <And> -- <Category>KDE</Category> -- <Category>Core</Category> -- </And> -- </Include> -- <DefaultMergeDirs/> -- <MergeFile>applications-kmenuedit.menu</MergeFile> --</Menu> -diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp ---- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 -+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 -@@ -379,7 +379,7 @@ - connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), - this, SLOT(slotCreateEntry(const QString &, KService **))); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); - entry->setLayoutInfo(kdeMenu->layoutList); -diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu ---- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 -+++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 -@@ -0,0 +1,469 @@ -+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" -+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> -+ -+<Menu> -+ <Name>Applications</Name> -+ <Directory>kde-main.directory</Directory> -+ <!-- Search the default locations --> -+ <KDELegacyDirs/> -+ <DefaultAppDirs/> -+ <DefaultDirectoryDirs/> -+ <DefaultLayout> -+ <Merge type="menus"/> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </DefaultLayout> -+ <Layout> -+ <Merge type="menus"/> -+ <Menuname>Applications</Menuname> -+ <Merge type="files"/> -+ </Layout> -+ -+ <Menu> -+ <Name>Applications</Name> -+ <Directory>kde-unknown.directory</Directory> -+ <OnlyUnallocated/> -+ <Include> -+ <Not> -+ <!-- Don't list non-KDE core applications --> -+ <And> -+ <Category>Core</Category> -+ <Not><Category>KDE</Category></Not> -+ </And> -+ <!-- Don't list SUSE's YaST in here --> -+ <Category>X-SuSE-YaST</Category> -+ </Not> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Development</Name> -+ <Directory>kde-development.directory</Directory> -+ <Menu> -+ <Name>X-KDE-KDevelopIDE</Name> -+ <Directory>kde-development-kdevelop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>X-KDE-KDevelopIDE</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Translation</Name> -+ <Directory>kde-development-translation.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>Translation</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Web Development</Name> -+ <Directory>kde-development-webdevelopment.directory</Directory> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Category>WebDevelopment</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Development</Category> -+ <Not><Category>X-KDE-KDevelopIDE</Category></Not> -+ <Not><Category>Translation</Category></Not> -+ <Not><Category>WebDevelopment</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-science.directory</Directory> -+ <Include> -+ <And><!-- Include /any/ Science app which is not an Education app --> -+ <Or> -+ <Category>Astronomy</Category> -+ <Category>Biology</Category> -+ <Category>Chemistry</Category> -+ <Category>Geology</Category> -+ <Category>MedicalSoftware</Category> -+ <Category>Physics</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ </Or> -+ <Not><Category>Education</Category></Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Edutainment</Name> -+ <Directory>kde-edutainment.directory</Directory> -+ <Menu> -+ <Name>Languages</Name> -+ <Directory>kde-edu-languages.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Mathematics</Name> -+ <Directory>kde-edu-mathematics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Math</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Miscellaneous</Name> -+ <Directory>kde-edu-miscellaneous.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Not> -+ <Category>Languages</Category> -+ <Category>X-KDE-Edu-Language</Category> -+ <Category>Math</Category> -+ <Category>Science</Category> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Not> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Science</Name> -+ <Directory>kde-edu-science.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Category>Science</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Tools</Name> -+ <Directory>kde-edu-tools.directory</Directory> -+ <Include> -+ <And> -+ <Category>Education</Category> -+ <Or> -+ <Category>Teaching</Category> -+ <Category>X-KDE-Edu-Teaching</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Games</Name> -+ <Directory>kde-games.directory</Directory> -+ <Menu> -+ <Name>Arcade</Name> -+ <Directory>kde-games-arcade.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>ArcadeGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Board</Name> -+ <Directory>kde-games-board.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>BoardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Card</Name> -+ <Directory>kde-games-card.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>CardGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Kidsgames</Name> -+ <Directory>kde-games-kids.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Or> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ </Or> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>TacticStrategy</Name> -+ <Directory>kde-games-strategy.directory</Directory> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Category>StrategyGame</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Include> -+ <And> -+ <Category>Game</Category> -+ <Not> -+ <Category>ArcadeGame</Category> -+ <Category>BoardGame</Category> -+ <Category>CardGame</Category> -+ <Category>X-KDE-KidsGame</Category> -+ <Category>KidsGame</Category> -+ <Category>StrategyGame</Category> -+ </Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Toys</Name> -+ <Directory>kde-toys.directory</Directory> -+ <Include> -+ <Category>Amusement</Category> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Graphics</Name> -+ <Directory>kde-graphics.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Graphics</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Internet</Name> -+ <Directory>kde-internet.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-internet-terminal.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Network</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Multimedia</Name> -+ <Directory>kde-multimedia.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>AudioVideo</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Office</Name> -+ <Directory>kde-office.directory</Directory> -+ <Layout> -+ <Merge type="menus"/> -+ <Filename>kde-koshell.desktop</Filename> -+ <Filename>kde-Kontact.desktop</Filename> -+ <Separator/> -+ <Filename>kde-kword.desktop</Filename> -+ <Filename>kde-kspread.desktop</Filename> -+ <Filename>kde-kpresenter.desktop</Filename> -+ <Merge type="files"/> -+ <Separator/> -+ <Menuname>More</Menuname> -+ </Layout> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Office</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Settingsmenu</Name> -+ <Directory>kde-settingsmenu.directory</Directory> -+ <Include> -+ <Category>Settings</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>System</Name> -+ <Directory>kde-system.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>System</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>ScreenSavers</Name> -+ <Directory>kde-system-screensavers.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>Terminal</Name> -+ <Directory>kde-system-terminal.directory</Directory> -+ </Menu> -+ </Menu> -+ <Menu> -+ <Name>Utilities</Name> -+ <Directory>kde-utilities.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Not><Category>Accessibility</Category></Not> -+ <Not><Category>X-KDE-Utilities-Desktop</Category></Not> -+ <Not><Category>X-KDE-Utilities-File</Category></Not> -+ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not> -+ <Not><Category>X-KDE-Utilities-PIM</Category></Not> -+ <Not><Category>X-KDE-More</Category></Not> -+ </And> -+ </Include> -+ <Menu> -+ <Name>Accessibility</Name> -+ <Directory>kde-utilities-accessibility.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>Accessibility</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Desktop</Name> -+ <Directory>kde-utilities-desktop.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Desktop</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Editors</Name> -+ <Directory>kde-editors.directory</Directory> -+ <Include> -+ <Category>TextEditor</Category> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>File</Name> -+ <Directory>kde-utilities-file.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-File</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>Peripherals</Name> -+ <Directory>kde-utilities-peripherals.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-Peripherals</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>PIM</Name> -+ <Directory>kde-utilities-pim.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-Utilities-PIM</Category> -+ </And> -+ </Include> -+ </Menu> -+ <Menu> -+ <Name>XUtilities</Name> -+ <Directory>kde-utilities-xutils.directory</Directory> -+ </Menu> -+ <Menu> -+ <Name>More</Name> -+ <Directory>kde-more.directory</Directory> -+ <Include> -+ <And> -+ <Category>Utility</Category> -+ <Category>X-KDE-More</Category> -+ </And> -+ </Include> -+ </Menu> -+ </Menu> -+ <Include> -+ <And> -+ <Category>KDE</Category> -+ <Category>Core</Category> -+ </And> -+ </Include> -+ <DefaultMergeDirs/> -+ <MergeFile>applications-kmenuedit.menu</MergeFile> -+</Menu> diff --git a/extra/kdelibs3/kdelibs3-cups16.patch b/extra/kdelibs3/kdelibs3-cups16.patch deleted file mode 100644 index 6736d49d3..000000000 --- a/extra/kdelibs3/kdelibs3-cups16.patch +++ /dev/null @@ -1,724 +0,0 @@ -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06 15:08:17.460612585 -0400 -@@ -629,26 +629,26 @@ - cups_lang_t* lang = cupsLangDefault(); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang)); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language); -- request_->request.op.operation_id = CUPS_GET_PRINTERS; -+ ippSetOperation(request_, CUPS_GET_PRINTERS); - request_ = cupsDoRequest(http_, request_, "/printers/"); - if (request_) - { - QString name; - int type(0); -- ipp_attribute_t *attr = request_->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); - while (attr) - { - // check new printer (keep only local non-implicit printers) -- if (!attr->name) -+ if (!ippGetName(attr)) - { - if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty()) - resources_.append(new CupsResource("/printers/"+name)); - name = ""; - type = 0; - } -- else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text; -- else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer; -- attr = attr->next; -+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL); -+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0); -+ attr = ippNextAttribute(request_); - } - if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty()) - resources_.append(new CupsResource("/printers/"+name)); -@@ -658,26 +658,26 @@ - request_ = ippNew(); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang)); - ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language); -- request_->request.op.operation_id = CUPS_GET_CLASSES; -+ ippSetOperation(request_, CUPS_GET_CLASSES); - request_ = cupsDoRequest(http_, request_, "/classes/"); - if (request_) - { - QString name; - int type(0); -- ipp_attribute_t *attr = request_->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); - while (attr) - { - // check new class (keep only local classes) -- if (!attr->name) -+ if (!ippGetName(attr)) - { - if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty()) - resources_.append(new CupsResource("/classes/"+name)); - name = ""; - type = 0; - } -- else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text; -- else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer; -- attr = attr->next; -+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL); -+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0); -+ attr = ippNextAttribute(request_); - } - if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty()) - resources_.append(new CupsResource("/classes/"+name)); -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2012-10-06 15:12:00.919127451 -0400 -@@ -51,32 +51,34 @@ - kdDebug(500) << "Null request" << endl; - return; - } -- kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl; -- kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl; -+ kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl; -+ kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl; - if (answer) - { -- kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl; -- kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl; -+ kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl; -+ kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl; - } - else -- kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl; -- kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl; -+ kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl; -+ int minorVersion; -+ int majorVersion = ippGetVersion(req, &minorVersion); -+ kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl; - kdDebug(500) << endl; - -- ipp_attribute_t *attr = req->attrs; -+ ipp_attribute_t *attr = ippFirstAttribute(req); - while (attr) - { -- QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); -- for (int i=0;i<attr->num_values;i++) -+ QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16); -+ for (int i=0;i<ippGetCount(attr);i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- s += ("0x"+QString::number(attr->values[i].integer, 16)); -+ s += ("0x"+QString::number(ippGetInteger(attr, i), 16)); - break; - case IPP_TAG_BOOLEAN: -- s += (attr->values[i].boolean ? "true" : "false"); -+ s += (ippGetBoolean(attr, i) ? "true" : "false"); - break; - case IPP_TAG_STRING: - case IPP_TAG_TEXT: -@@ -88,16 +90,16 @@ - case IPP_TAG_TEXTLANG: - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: -- s += attr->values[i].string.text; -+ s += ippGetString(attr, i, NULL); - break; - default: - break; - } -- if (i != (attr->num_values-1)) -+ if (i != (ippGetCount(attr)-1)) - s += ", "; - } - kdDebug(500) << s << endl; -- attr = attr->next; -+ attr = ippNextAttribute(req); - } - } - -@@ -177,7 +179,7 @@ - ipp_attribute_t *attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL); - int i(0); - for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].string.text = strdup((*it).local8Bit()); -+ ippSetString(request_, &attr, i, strdup((*it).local8Bit())); - } - } - -@@ -193,7 +195,7 @@ - ipp_attribute_t *attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL); - int i(0); - for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].integer = *it; -+ ippSetInteger(request_, &attr, i, *it); - } - } - -@@ -209,19 +211,19 @@ - ipp_attribute_t *attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL); - int i(0); - for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++) -- attr->values[i].boolean = (char)(*it); -+ ippSetBoolean(request_, &attr, i, (char)(*it)); - } - } - - void IppRequest::setOperation(int op) - { -- request_->request.op.operation_id = (ipp_op_t)op; -- request_->request.op.request_id = 1; // 0 is not RFC-compliant, should be at least 1 -+ ippSetOperation(request_, (ipp_op_t)op); -+ ippSetRequestId(request_, 1); // 0 is not RFC-compliant, should be at least 1 - } - - int IppRequest::status() - { -- return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2)); -+ return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2)); - } - - QString IppRequest::statusMessage() -@@ -248,7 +250,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); - if (attr) - { -- value = attr->values[0].integer; -+ value = ippGetInteger(attr, 0); - return true; - } - else return false; -@@ -260,7 +262,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type); - if (attr) - { -- value = QString::fromLocal8Bit(attr->values[0].string.text); -+ value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL)); - return true; - } - else return false; -@@ -273,8 +275,8 @@ - values.clear(); - if (attr) - { -- for (int i=0;i<attr->num_values;i++) -- values.append(QString::fromLocal8Bit(attr->values[i].string.text)); -+ for (int i=0;i<ippGetCount(attr);i++) -+ values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))); - return true; - } - else return false; -@@ -286,7 +288,7 @@ - ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN); - if (attr) - { -- value = (bool)attr->values[0].boolean; -+ value = (bool)ippGetBoolean(attr, 0); - return true; - } - else return false; -@@ -338,10 +340,10 @@ - } - - /* No printers found */ -- if ( request_ && request_->request.status.status_code == 0x406 ) -+ if ( request_ && ippGetStatusCode(request_) == 0x406 ) - return true; - -- if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) -+ if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00)) - return false; - - -@@ -356,36 +358,36 @@ - output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl; - output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl; - // go to the first attribute of the specified group -- ipp_attribute_t *attr = request_->attrs; -- while (attr && attr->group_tag != group) -- attr = attr->next; -+ ipp_attribute_t *attr = ippFirstAttribute(request_); -+ while (attr && ippGetGroupTag(attr) != group) -+ attr = ippNextAttribute(request_); - // print each attribute -- ipp_uchar_t *d; -- QCString dateStr; -- QDateTime dt; -- bool bg(false); -- while (attr && attr->group_tag == group) -+ const ipp_uchar_t *d; -+ QCString dateStr; -+ QDateTime dt; -+ bool bg(false); -+ while (attr && ippGetGroupTag(attr) == group) - { -- output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << attr->name << "</b></td>\n <td>" << endl; -+ output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << ippGetName(attr) << "</b></td>\n <td>" << endl; - bg = !bg; -- for (int i=0; i<attr->num_values; i++) -+ for (int i=0; i<ippGetCount(attr); i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: -- if (attr->name && strstr(attr->name, "time")) -+ if (ippGetName(attr) && strstr(ippGetName(attr), "time")) - { -- dt.setTime_t((unsigned int)(attr->values[i].integer)); -+ dt.setTime_t((unsigned int)(ippGetInteger(attr, i))); - output << dt.toString(); - } - else -- output << attr->values[i].integer; -+ output << ippGetInteger(attr, i); - break; - case IPP_TAG_ENUM: -- output << "0x" << hex << attr->values[i].integer << dec; -+ output << "0x" << hex << ippGetInteger(attr, i) << dec; - break; - case IPP_TAG_BOOLEAN: -- output << (attr->values[i].boolean ? i18n("True") : i18n("False")); -+ output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False")); - break; - case IPP_TAG_STRING: - case IPP_TAG_TEXTLANG: -@@ -397,18 +399,25 @@ - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: - case IPP_TAG_MIMETYPE: -- output << attr->values[i].string.text; -+ output << ippGetString(attr, i, NULL); - break; - case IPP_TAG_RESOLUTION: -- output << "( " << attr->values[i].resolution.xres -- << ", " << attr->values[i].resolution.yres << " )"; -+ int xres; -+ int yres; -+ ipp_res_t units; -+ xres = ippGetResolution(attr, i, &yres, &units); -+ output << "( " << xres -+ << ", " << yres << " )"; - break; - case IPP_TAG_RANGE: -- output << "[ " << (attr->values[i].range.lower > 0 ? attr->values[i].range.lower : 1) -- << ", " << (attr->values[i].range.upper > 0 ? attr->values[i].range.upper : 65535) << " ]"; -+ int lowervalue; -+ int uppervalue; -+ lowervalue = ippGetRange(attr, i, &uppervalue); -+ output << "[ " << (lowervalue > 0 ? lowervalue : 1) -+ << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]"; - break; - case IPP_TAG_DATE: -- d = attr->values[i].date; -+ d = ippGetDate(attr, i); - dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d", - d[0]*256+d[1], d[2], d[3], - d[4], d[5], d[6], -@@ -418,11 +427,11 @@ - default: - continue; - } -- if (i < attr->num_values-1) -+ if (i < ippGetCount(attr)-1) - output << "<br>"; - } - output << "</td>\n </tr>" << endl; -- attr = attr->next; -+ attr = ippNextAttribute(request_); - } - // end table - output << "</table>" << endl; -@@ -438,31 +447,34 @@ - ipp_attribute_t *attr = first(); - while (attr) - { -- if (group != -1 && attr->group_tag != group) -+ if (group != -1 && ippGetGroupTag(attr) != group) - { -- attr = attr->next; -+ attr = ippNextAttribute(request_); - continue; - } - QString value; -- for (int i=0; i<attr->num_values; i++) -+ for (int i=0; i<ippGetCount(attr); i++) - { -- switch (attr->value_tag) -+ switch (ippGetValueTag(attr)) - { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- value.append(QString::number(attr->values[i].integer)).append(","); -+ value.append(QString::number(ippGetInteger(attr, i))).append(","); - break; - case IPP_TAG_BOOLEAN: -- value.append((attr->values[i].boolean ? "true" : "false")).append(","); -+ value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(","); - break; - case IPP_TAG_RANGE: -- if (attr->values[i].range.lower > 0) -- value.append(QString::number(attr->values[i].range.lower)); -- if (attr->values[i].range.lower != attr->values[i].range.upper) -+ int lowervalue; -+ int uppervalue; -+ lowervalue = ippGetRange(attr, i, &uppervalue); -+ if (lowervalue > 0) -+ value.append(QString::number(lowervalue)); -+ if (lowervalue != uppervalue) - { - value.append("-"); -- if (attr->values[i].range.upper > 0) -- value.append(QString::number(attr->values[i].range.upper)); -+ if (uppervalue > 0) -+ value.append(QString::number(uppervalue)); - } - value.append(","); - break; -@@ -476,7 +488,7 @@ - case IPP_TAG_TEXTLANG: - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: -- value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(","); -+ value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(","); - break; - default: - break; -@@ -484,8 +496,8 @@ - } - if (!value.isEmpty()) - value.truncate(value.length()-1); -- opts[QString::fromLocal8Bit(attr->name)] = value; -- attr = attr->next; -+ opts[QString::fromLocal8Bit(ippGetName(attr))] = value; -+ attr = ippNextAttribute(request_); - } - } - return opts; -@@ -542,3 +554,7 @@ - } - #endif - } -+ -+ -+ipp_attribute_t* IppRequest::first() -+{ return (request_ ? ippFirstAttribute(request_) : NULL); } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h kdelibs-3.5.10/kdeprint/cups/ipprequest.h ---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.h 2012-10-06 15:06:05.581489574 -0400 -@@ -72,7 +72,7 @@ - bool keyword(const QString& name, QStringList& value); - bool mime(const QString& name, QString& value); - ipp_attribute_t* first(); -- ipp_attribute_t* last(); -+ ipp_t* request(); - QMap<QString,QString> toMap(int group = -1); - void setMap(const QMap<QString,QString>& opts); - -@@ -178,12 +178,6 @@ - inline bool IppRequest::doRequest(const QString& res) - { return doFileRequest(res); } - --inline ipp_attribute_t* IppRequest::first() --{ return (request_ ? request_->attrs : NULL); } -- --inline ipp_attribute_t* IppRequest::last() --{ return (request_ ? request_->last : NULL); } -- - inline void IppRequest::setHost(const QString& host) - { host_ = host; } - -@@ -193,4 +187,7 @@ - inline void IppRequest::dump(int state) - { dump_ = state; } - -+inline ipp_t* IppRequest::request() -+{ return request_; } -+ - #endif -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp 2012-10-06 15:13:31.451859386 -0400 -@@ -36,6 +36,8 @@ - #include <kdebug.h> - #include <kurl.h> - -+#include "config.h" -+ - KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/) - : KMJobManager(parent,name) - { -@@ -166,17 +168,18 @@ - void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) - { - ipp_attribute_t *attr = req.first(); -+ ipp_attribute_t *nextAttr; - KMJob *job = new KMJob(); - QString uri; - while (attr) - { -- QString name(attr->name); -- if (name == "job-id") job->setId(attr->values[0].integer); -- else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text)); -- else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text)); -+ QString name(ippGetName(attr)); -+ if (name == "job-id") job->setId(ippGetInteger(attr, 0)); -+ else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); -+ else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - else if (name == "job-state") - { -- switch (attr->values[0].integer) -+ switch (ippGetInteger(attr, 0)) - { - case IPP_JOB_PENDING: - job->setState(KMJob::Queued); -@@ -204,29 +207,30 @@ - break; - } - } -- else if (name == "job-k-octets") job->setSize(attr->values[0].integer); -- else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text)); -- else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer); -- else if (name == "job-media-sheets") job->setPages(attr->values[0].integer); -- else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer); -+ else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0)); -+ else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); -+ else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0)); -+ else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0)); -+ else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0)); - else if (name == "job-printer-uri" && !pr->isRemote()) - { -- QString str(attr->values[0].string.text); -+ QString str(ippGetString(attr, 0, NULL)); - int p = str.findRev('/'); - if (p != -1) - job->setPrinter(str.mid(p+1)); - } - else if (name == "job-priority") - { -- job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3)); -+ job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3)); - } - else if (name == "job-billing") - { - job->setAttributeCount(2); -- job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text)); -+ job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - } - -- if (name.isEmpty() || attr == req.last()) -+ nextAttr = ippNextAttribute(req.request()); -+ if (name.isEmpty() || (!nextAttr)) - { - if (job->printer().isEmpty()) - job->setPrinter(pr->printerName()); -@@ -234,8 +238,7 @@ - addJob(job); // don't use job after this call !!! - job = new KMJob(); - } -- -- attr = attr->next; -+ attr = nextAttr; - } - delete job; - } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp 2012-10-06 15:14:22.311521604 -0400 -@@ -476,19 +476,20 @@ - void KMCupsManager::processRequest(IppRequest* req) - { - ipp_attribute_t *attr = req->first(); -+ ipp_attribute_t *nextAttr; - KMPrinter *printer = new KMPrinter(); - while (attr) - { -- QString attrname(attr->name); -+ QString attrname(ippGetName(attr)); - if (attrname == "printer-name") - { -- QString value = QString::fromLocal8Bit(attr->values[0].string.text); -+ QString value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL)); - printer->setName(value); - printer->setPrinterName(value); - } - else if (attrname == "printer-type") - { -- int value = attr->values[0].integer; -+ int value = ippGetInteger(attr, 0); - printer->setType(0); - printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer)); - if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote); -@@ -499,7 +500,7 @@ - } - else if (attrname == "printer-state") - { -- switch (attr->values[0].integer) -+ switch (ippGetInteger(attr, 0)) - { - case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break; - case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break; -@@ -508,22 +509,24 @@ - } - else if (attrname == "printer-uri-supported") - { -- printer->setUri(KURL(attr->values[0].string.text)); -+ printer->setUri(KURL(ippGetString(attr, 0, NULL))); - } - else if (attrname == "printer-location") - { -- printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text)); -+ printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL))); - } - else if (attrname == "printer-is-accepting-jobs") - { -- printer->setAcceptJobs(attr->values[0].boolean); -+ printer->setAcceptJobs(ippGetBoolean(attr, 0)); - } -- if (attrname.isEmpty() || attr == req->last()) -+ -+ nextAttr = ippNextAttribute(req->request()); -+ if (attrname.isEmpty() || (!nextAttr)) - { - addPrinter(printer); - printer = new KMPrinter(); - } -- attr = attr->next; -+ attr = nextAttr; - } - delete printer; - } -@@ -817,6 +820,7 @@ - { - QStringList list; - IppRequest req; -+ ipp_attribute_t *nextAttr; - req.setOperation(CUPS_GET_DEVICES); - if (req.doRequest("/")) - { -@@ -824,12 +828,13 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- QString attrname(attr->name); -- if (attrname == "device-info") desc = attr->values[0].string.text; -- else if (attrname == "device-make-and-model") printer = attr->values[0].string.text; -- else if (attrname == "device-uri") uri = attr->values[0].string.text; -- else if ( attrname == "device-class" ) cl = attr->values[ 0 ].string.text; -- if (attrname.isEmpty() || attr == req.last()) -+ QString attrname(ippGetName(attr)); -+ if (attrname == "device-info") desc = ippGetString(attr, 0, NULL); -+ else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL); -+ else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL); -+ else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL); -+ nextAttr = ippNextAttribute(req.request()); -+ if (attrname.isEmpty() || (!nextAttr)) - { - if (!uri.isEmpty()) - { -@@ -838,7 +843,7 @@ - } - uri = desc = printer = cl = QString::null; - } -- attr = attr->next; -+ attr = nextAttr; - } - } - return list; -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp 2012-10-06 15:14:55.177970017 -0400 -@@ -60,6 +60,8 @@ - #include <kaction.h> - #include <kmessagebox.h> - -+#include "config.h" -+ - KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/) - : KMUiManager(parent,name) - { -@@ -143,22 +145,22 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"device-uri") == 0) -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0) - { -- if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true); -- else if (strncmp(attr->values[0].string.text,"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"serial",6) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true); -- else if (strncmp(attr->values[0].string.text,"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true); -- else if (strncmp(attr->values[0].string.text,"usb",3) == 0) backend->enableBackend(KMWizard::Local,true); -- else if (strncmp(attr->values[0].string.text,"http",4) == 0 || strncmp(attr->values[0].string.text,"ipp",3) == 0) -+ if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0) - { - backend->enableBackend(KMWizard::IPP,true); - backend->enableBackend(KMWizard::Custom+1,true); - } -- else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true); -+ else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true); - } -- attr = attr->next; -+ attr = ippNextAttribute(req.request()); - } - backend->enableBackend(KMWizard::Class, true); - backend->enableBackend(KMWizard::Custom+5, true); -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp 2012-10-06 15:15:28.044418449 -0400 -@@ -30,6 +30,8 @@ - #include <kiconloader.h> - #include <kurl.h> - -+#include "config.h" -+ - KMWFax::KMWFax(QWidget *parent, const char *name) - : KMWizardPage(parent,name) - { -@@ -55,11 +57,11 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0) -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) - { -- m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text)); -+ m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL))); - } -- attr = attr->next; -+ attr = ippNextAttribute(req.request()); - } - } - } -diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp ---- kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp 2012-10-06 14:49:37.521406729 -0400 -+++ kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp 2012-10-06 15:15:56.867560417 -0400 -@@ -29,6 +29,8 @@ - #include <kdebug.h> - #include <kiconloader.h> - -+#include "config.h" -+ - KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name) - : KMWizardPage(parent,name) - { -@@ -83,9 +85,9 @@ - ipp_attribute_t *attr = req.first(); - while (attr) - { -- if (attr->name && strcmp(attr->name,"printer-name") == 0) -- m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text)); -- attr = attr->next; -+ if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0) -+ m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL))); -+ attr = ippNextAttribute(req.request()); - } - m_list->sort(); - } diff --git a/extra/kdelibs3/kdelibs3-missing-include.patch b/extra/kdelibs3/kdelibs3-missing-include.patch deleted file mode 100644 index 5b84ef746..000000000 --- a/extra/kdelibs3/kdelibs3-missing-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.000000000 -0500 -+++ kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.000000000 -0500 -@@ -2,6 +2,7 @@ - #include <cups/http.h> - #include <cups/cups.h> - #include <stdlib.h> -+#include <stdio.h> - #include <fcntl.h> - #include <sys/stat.h> - #include <unistd.h> diff --git a/extra/kdelibs3/openssl.patch b/extra/kdelibs3/openssl.patch deleted file mode 100644 index a948b884a..000000000 --- a/extra/kdelibs3/openssl.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -430,9 +435,14 @@ KConfig *cfg; - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -594,7 +604,7 @@ KConfig *cfg; - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h ---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200 -@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate; - #include <openssl/stack.h> - #include <openssl/bn.h> - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include <kstaticdeleter.h> -@@ -446,12 +449,12 @@ public: - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ public: - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ public: - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ public: - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } -+#endif - - /* - * Duplicate the stack -diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200 -+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100 -+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200 -@@ -1003,17 +1003,31 @@ return qba; - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 740569631..d56fb83aa 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 185799 2013-05-19 09:24:25Z tpowa $ +# $Id: PKGBUILD 212795 2014-05-15 07:47:16Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools -pkgver=2.0.4 -pkgrel=2 +pkgver=2.0.6 +pkgrel=1 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/kexec/" source=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2" # upstream tarballs broken with bsdtar! - #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2" + #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.xz" ) depends=('gawk' 'zlib' 'xz') -backup=('etc/conf.d/kexec') license=('GPL2') build() { @@ -27,4 +26,5 @@ package() { make DESTDIR=$pkgdir install install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 } -md5sums=('4713026758923f5f3968905291b991ee') +md5sums=('9192e5b9fab094b90f481226d1ad5e74') +md5sums=('2baef0f424fa9994ba2c54cc93ed1233') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index d4484c556..bc444b0d1 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211252 2014-04-18 11:36:10Z heftig $ +# $Id: PKGBUILD 212851 2014-05-15 20:25:09Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d0fe35ec7a6e8ef0c8d589243adeae3dc663be11169388228939cc56a4c0df2a') +sha256sums=('e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173') build() { cd "$pkgname-$pkgver" diff --git a/extra/polari/PKGBUILD b/extra/polari/PKGBUILD index 395363d91..6d59d73d5 100644 --- a/extra/polari/PKGBUILD +++ b/extra/polari/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 211246 2014-04-18 11:31:23Z heftig $ +# $Id: PKGBUILD 212849 2014-05-15 20:18:11Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=polari -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 pkgdesc="An IRC Client for GNOME" arch=(i686 x86_64) license=(GPL) url="https://wiki.gnome.org/Apps/Polari" -depends=(gjs gtk3 telepathy-glib telepathy-idle) +depends=(gjs gtk3 telepathy-glib telepathy-idle telepathy-mission-control telepathy-logger) makedepends=(intltool) groups=(gnome-extra) install=polari.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4ce3dc304e4c1b3776a4d9643e85b3e7075512924464e9ed8be59cdb10289271') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995') build() { cd $pkgname-$pkgver diff --git a/extra/qalculate-kde/PKGBUILD b/extra/qalculate-kde/PKGBUILD deleted file mode 100644 index 32b06321e..000000000 --- a/extra/qalculate-kde/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 208232 2014-03-20 04:27:17Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=qalculate-kde -pkgver=0.9.7 -pkgrel=4 -pkgdesc="KDE frontend for libqalculate" -arch=('i686' 'x86_64') -url="http://qalculate.sourceforge.net/" -license=('GPL') -depends=('libqalculate' 'kdelibs3' 'cln') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz - qalculate-kde-0.9.7-gcc47.patch) -sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91' - '8f23a12dd37e2fd3d316b78ee0831700310c0d36') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/qalculate-kde-0.9.7-gcc47.patch" -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/opt/kde --without-arts - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch b/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch deleted file mode 100644 index 33d4047e1..000000000 --- a/extra/qalculate-kde/qalculate-kde-0.9.7-gcc47.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp ---- qalculate-kde-0.9.7/src/qalculateeditfunctiondialog.cpp 2009-12-03 17:06:06.000000000 +0100 -+++ qalculate-kde-0.9.7-gcc47/src/qalculateeditfunctiondialog.cpp 2012-07-31 23:50:07.000000000 +0200 -@@ -377,10 +377,10 @@ - str = defarg.printlong().c_str(); - str2 = ""; - } -- QListViewItem *i = new KListViewItem(argumentsView, i_prev, str2, str); -- i_prev = i; -- argumentsItems[i] = arg; -- argumentsItemsEdited[i] = false; -+ QListViewItem *item = new KListViewItem(argumentsView, i_prev, str2, str); -+ i_prev = item; -+ argumentsItems[item] = arg; -+ argumentsItemsEdited[item] = false; - } - } - argumentsView->setResizeMode(KListView::AllColumns); diff --git a/extra/qemu/2.0.0-usb-stack.patch b/extra/qemu/2.0.0-usb-stack.patch new file mode 100644 index 000000000..8829df92c --- /dev/null +++ b/extra/qemu/2.0.0-usb-stack.patch @@ -0,0 +1,36 @@ +Correct post load checks: +1. dev->setup_len == sizeof(dev->data_buf) + seems fine, no need to fail migration +2. When state is DATA, passing index > len + will cause memcpy with negative length, + resulting in heap overflow + +First of the issues was reported by dgilbert. + +Reported-by: "Dr. David Alan Gilbert" <dgilbert <at> redhat.com> +Signed-off-by: Michael S. Tsirkin <mst <at> redhat.com> +--- + +changes from v1: +- drop state check +- lightly tested + + hw/usb/bus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/usb/bus.c b/hw/usb/bus.c +index e48b19f..ff1dfe6 100644 +--- a/hw/usb/bus.c ++++ b/hw/usb/bus.c + <at> <at> -51,8 +51,8 <at> <at> static int usb_device_post_load(void *opaque, int version_id) + } + if (dev->setup_index < 0 || + dev->setup_len < 0 || +- dev->setup_index >= sizeof(dev->data_buf) || +- dev->setup_len >= sizeof(dev->data_buf)) { ++ dev->setup_index > dev->setup_len || ++ dev->setup_len > sizeof(dev->data_buf)) { + return -EINVAL; + } + return 0; + diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 21cbd7e1d..ab5b8a8ab 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 212224 2014-05-11 08:54:01Z tpowa $ +# $Id: PKGBUILD 212784 2014-05-15 06:48:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=('qemu' 'libcacard') pkgver=2.0.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" @@ -14,7 +14,14 @@ makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' replaces=('qemu-kvm') options=(!strip) source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - 65-kvm.rules) + 65-kvm.rules + 2.0.0-usb-stack.patch) + +prepare () +{ + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/2.0.0-usb-stack.patch" +} build () { @@ -22,6 +29,7 @@ build () # qemu vs. make 4 == bad export ARFLAGS="rv" # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 + # gtk gui breaks keymappings at the moment ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ @@ -82,4 +90,5 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } md5sums=('2790f44fd76da5de5024b4aafeb594c2' - '33ab286a20242dda7743a900f369d68a') + '33ab286a20242dda7743a900f369d68a' + 'f98a479ec4e656403f5f05b1914f7f1f') diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD deleted file mode 100644 index dead707dd..000000000 --- a/extra/qt3/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 197418 2013-10-25 18:37:20Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=qt3 -pkgver=3.3.8b -pkgrel=7 -epoch=1 -pkgdesc="A cross-platform application and UI framework" -arch=('i686' 'x86_64') -url="http://www.trolltech.com/products/qt/index.html" -license=('GPL') -depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' - 'libxrandr' 'libmng') -makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('qtchooser: set the default Qt toolkit' - 'libmariadbclient: MariaDB driver' - 'postgresql-libs: PostgreSQL driver' - 'unixodbc: ODBC driver') -options=('!docs') -source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz - qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 - eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch - qt-x11-free-3.3.5-makelibshared.patch) -sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' - '3d19510c46016a1a211d97bf8f82b01498b1b33c' - '33418e5b117458af23c72cdbffc0c339bc34bdc4' - '116afa0e737bdf27ea27f9b3653aeb56db9ec151' - '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' - '1346320614f6f86fbeb10b9fbad721dea29f5b61' - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f' - 'e89720eac87c3e925d0efae6a16f334c5159e4f6') - -# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ -# other qt-patches come from fedora and gentoo - -prepare() { - cd qt-x11-free-${pkgver} - # apply qt patches from kde.org - for i in ../qt-copy-kde-patches/*; do - patch -p0 -i $i - done - # apply other qt patches and one security fix from debian/gentoo - for i in ../qt-patches/*; do - patch -p1 -i $i - done - # fix CJK font/chars select error (FS#11245) - patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff - # fix build problem against new unixODBC - patch -p1 -i "${srcdir}"/qt-odbc.patch - # fix build with gcc 4.6.0 - patch -p1 -i "${srcdir}"/gcc-4.6.patch - patch -p0 -i "${srcdir}"/qt3-png15.patch - - patch -p1 -i "${srcdir}"/qt-x11-free-3.3.5-makelibshared.patch - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - sed -i "s|read acceptance|acceptance=yes|" configure -} - -build() { - export QTDIR="${srcdir}"/qt-x11-free-${pkgver} - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH - fi - - cd qt-x11-free-${pkgver} - ./configure \ - -prefix /usr \ - -bindir /usr/lib/qt3/bin \ - -headerdir /usr/include/qt3 \ - -plugindir /usr/lib/qt3/plugins \ - -datadir /usr/share/qt3 \ - -translationdir /usr/share/qt3/translations \ - -I/usr/include/mysql -I/usr/include/postgresql/server \ - -platform linux-g++$ARCH \ - -system-zlib \ - -qt-gif \ - -release \ - -shared \ - -sm \ - -nis \ - -thread \ - -stl \ - -system-lib{png,jpeg,mng} \ - -no-g++-exceptions \ - -plugin-sql-{mysql,psql,sqlite,odbc} - - make -} - -package() { - cd qt-x11-free-${pkgver} - make INSTALL_ROOT="${pkgdir}" install - sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl - rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations} - rm -rf "${pkgdir}"/usr/share/qt3/mkspecs/{aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,linux-g++$ARCH/linux-g++$ARCH,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - -# install man pages - install -d -m755 "${pkgdir}"/usr/share/man - cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/usr/share/man/ - for i in "${pkgdir}"/usr/share/man/man1/*; do - mv $i ${i%.*}-qt3.1 - done - -# Useful symlinks for cmake and configure scripts - install -d "${pkgdir}"/usr/bin - for b in "${pkgdir}"/usr/lib/qt3/bin/*; do - ln -s /usr/lib/qt3/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt3 - done -} diff --git a/extra/qt3/eastern_asian_languagues.diff b/extra/qt3/eastern_asian_languagues.diff deleted file mode 100644 index 7c25eef7d..000000000 --- a/extra/qt3/eastern_asian_languagues.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 -+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 -@@ -966,20 +966,22 @@ - - #ifdef Q_WS_X11 - if (script == QFont::Han) { -- // modify script according to locale -- static QFont::Script defaultHan = QFont::UnknownScript; -- if (defaultHan == QFont::UnknownScript) { -- QCString locale = setlocale(LC_ALL, NULL); -- if (locale.contains("ko")) -- defaultHan = QFont::Han_Korean; -- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -- defaultHan = QFont::Han_TraditionalChinese; -- else if (locale.contains("zh")) -- defaultHan = QFont::Han_SimplifiedChinese; -- else -- defaultHan = QFont::Han_Japanese; -- } -- script = defaultHan; -+ // modify script according to locale -+ static QFont::Script defaultHan; -+ QCString locale = setlocale(LC_ALL, NULL); -+ -+ if (locale.contains("ko")) -+ defaultHan = QFont::Han_Korean; -+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -+ defaultHan = QFont::Han_TraditionalChinese; -+ else if (locale.contains("zh")) -+ defaultHan = QFont::Han_SimplifiedChinese; -+ else if (locale.contains("ja")) -+ defaultHan = QFont::Han_Japanese; -+ else -+ defaultHan = QFont::Han; // don't change -+ -+ script = defaultHan; - } - #endif - diff --git a/extra/qt3/gcc-4.6.patch b/extra/qt3/gcc-4.6.patch deleted file mode 100644 index bcbffcea6..000000000 --- a/extra/qt3/gcc-4.6.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h ---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 -@@ -49,6 +49,7 @@ - #include "qvaluelist.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <map> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 -@@ -47,6 +47,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <list> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h ---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 -@@ -45,6 +45,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <vector> - #endif diff --git a/extra/qt3/qt-copy-kde-patches.tar.bz2 b/extra/qt3/qt-copy-kde-patches.tar.bz2 Binary files differdeleted file mode 100644 index 519f7173a..000000000 --- a/extra/qt3/qt-copy-kde-patches.tar.bz2 +++ /dev/null diff --git a/extra/qt3/qt-odbc.patch b/extra/qt3/qt-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/extra/qt3/qt-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/extra/qt3/qt-patches.tar.bz2 b/extra/qt3/qt-patches.tar.bz2 Binary files differdeleted file mode 100644 index 3f4aee171..000000000 --- a/extra/qt3/qt-patches.tar.bz2 +++ /dev/null diff --git a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch deleted file mode 100644 index fd4adf7f0..000000000 --- a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig 2005-10-21 10:09:12.000000000 -0200 -+++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro 2005-10-21 10:09:34.000000000 -0200 -@@ -3,8 +3,7 @@ - VERSION = 1.0 - - CONFIG += qt warn_on release --CONFIG += staticlib --CONFIG -= dll -+CONFIG += dll - - SOURCES = qassistantclient.cpp - HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h -*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro 2003-12-20 22:48:51.000000000 -0200 ---- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new 2005-12-06 18:47:04.000000000 -0200 -*************** -*** 1,6 **** - TEMPLATE = lib -! CONFIG += qt warn_on staticlib -! CONFIG -= dll - HEADERS = editor.h \ - parenmatcher.h \ - completion.h \ ---- 1,6 ---- - TEMPLATE = lib -! CONFIG += qt warn_on -! CONFIG += dll - HEADERS = editor.h \ - parenmatcher.h \ - completion.h \ -*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro 2004-04-29 19:31:32.000000000 -0300 ---- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new 2005-12-06 18:46:29.000000000 -0200 -*************** -*** 1,7 **** - TEMPLATE = lib - -! CONFIG += qt warn_on staticlib qmake_cache -! CONFIG -= dll - !force_static:!win32:contains(QT_PRODUCT,qt-internal) { - CONFIG -= staticlib - CONFIG += dll ---- 1,7 ---- - TEMPLATE = lib - -! CONFIG += qt warn_on qmake_cache -! CONFIG += dll - !force_static:!win32:contains(QT_PRODUCT,qt-internal) { - CONFIG -= staticlib - CONFIG += dll diff --git a/extra/qt3/qt3-png15.patch b/extra/qt3/qt3-png15.patch deleted file mode 100644 index e64fea36a..000000000 --- a/extra/qt3/qt3-png15.patch +++ /dev/null @@ -1,212 +0,0 @@ -$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ - ---- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 -+++ src/kernel/qpngio.cpp -@@ -43,6 +43,7 @@ - #include "qiodevice.h" - - #include <png.h> -+#include <zlib.h> - - - #ifdef Q_OS_TEMP -@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); - -+ png_colorp info_ptr_palette = NULL; -+ int info_ptr_num_palette = 0; -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); -+ } -+ -+ png_bytep info_ptr_trans_alpha = NULL; -+ int info_ptr_num_trans = 0; -+ png_color_16p info_ptr_trans_color = NULL; -+ -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); -+ } -+ -+ - if ( color_type == PNG_COLOR_TYPE_GRAY ) { - // Black & White or 8-bit grayscale -- if ( bit_depth == 1 && info_ptr->channels == 1 ) { -+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { - png_set_invert_mono( png_ptr ); - png_read_update_info( png_ptr, info_ptr ); - if (!image.create( width, height, 1, 2, QImage::BigEndian )) -@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr_trans_color->gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct - } - } else if ( color_type == PNG_COLOR_TYPE_PALETTE - && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) -- && info_ptr->num_palette <= 256 ) -+ && info_ptr_num_palette <= 256 ) - { - // 1-bit and 8-bit color - if ( bit_depth != 1 ) -@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct - png_read_update_info( png_ptr, info_ptr ); - png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); -- if (!image.create(width, height, bit_depth, info_ptr->num_palette, -+ if (!image.create(width, height, bit_depth, info_ptr_num_palette, - QImage::BigEndian)) - return; - int i = 0; - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { - image.setAlphaBuffer( TRUE ); -- while ( i < info_ptr->num_trans ) { -+ while ( i < info_ptr_num_trans ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, -+ info_ptr_trans_alpha[i] - ) - ); - i++; - } - } -- while ( i < info_ptr->num_palette ) { -+ while ( i < info_ptr_num_palette ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, - 0xff - ) - ); -@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) - return; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - iio->setStatus(-4); - return; -@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q - return FALSE; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return FALSE; - } -@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q - - png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); - -+#warning XXXtnn not too sure about this -+/* -+according to png.h, channels is only used on read, not writes, so we -+should be able to comment this out. -+ - info_ptr->channels = - (image.depth() == 32) - ? (image.hasAlphaBuffer() ? 4 : 3) - : 1; -+*/ - - png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), - image.depth() == 1 ? 1 : 8 /* per channel */, -@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q - : PNG_COLOR_TYPE_RGB - : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); - -+ png_color_8 sig_bit; -+ sig_bit.red = 8; -+ sig_bit.green = 8; -+ sig_bit.blue = 8; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - -- //png_set_sBIT(png_ptr, info_ptr, 8); -- info_ptr->sig_bit.red = 8; -- info_ptr->sig_bit.green = 8; -- info_ptr->sig_bit.blue = 8; - - if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) - png_set_packswap(png_ptr); -@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q - png_set_PLTE(png_ptr, info_ptr, palette, num_palette); - int* trans = new int[num_palette]; - int num_trans = 0; -+ png_colorp info_ptr_palette = NULL; -+ int tmp; -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); - for (int i=0; i<num_palette; i++) { - QRgb rgb=image.color(i); -- info_ptr->palette[i].red = qRed(rgb); -- info_ptr->palette[i].green = qGreen(rgb); -- info_ptr->palette[i].blue = qBlue(rgb); -+ info_ptr_palette[i].red = qRed(rgb); -+ info_ptr_palette[i].green = qGreen(rgb); -+ info_ptr_palette[i].blue = qBlue(rgb); - if (image.hasAlphaBuffer()) { - trans[i] = rgb >> 24; - if (trans[i] < 255) { -@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q - } - } - } -+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); - if (num_trans) { - copy_trans = new png_byte[num_trans]; - for (int i=0; i<num_trans; i++) -@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q - } - - if ( image.hasAlphaBuffer() ) { -- info_ptr->sig_bit.alpha = 8; -+ png_color_8p sig_bit; -+ png_get_sBIT(png_ptr, info_ptr, &sig_bit); -+ sig_bit->alpha = 8; -+ png_set_sBIT(png_ptr, info_ptr, sig_bit); - } - - // Swap ARGB to RGBA (normal PNG format) before saving on -@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma - return -1; - } - -- if (setjmp((png_ptr)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - return -1; -@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma - - if ( !png_ptr ) return 0; - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - state = MovieStart; -@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn - consumer->frameDone(QPoint(offx,offy),r); - consumer->end(); - state = FrameStart; -- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us -+ unused_data = png_process_data_pause(png, 0); - } - - #ifdef PNG_USER_CHUNKS_SUPPORTED |