From d8d675cb1e75787b0db061756e4cbebe3c5a03fa Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 Mar 2013 00:04:11 -0800 Subject: Thu Mar 7 00:04:11 PST 2013 --- community/chromium-bsu/PKGBUILD | 6 +-- community/glpng/Makefile | 30 --------------- community/glpng/PKGBUILD | 35 ----------------- community/glpng/libpng15.patch | 83 ---------------------------------------- community/glpng/license | 21 ---------- community/kicad/PKGBUILD | 20 ++++++---- community/libgda4/PKGBUILD | 38 ------------------ community/libgda4/libgda.install | 12 ------ 8 files changed, 16 insertions(+), 229 deletions(-) delete mode 100644 community/glpng/Makefile delete mode 100644 community/glpng/PKGBUILD delete mode 100644 community/glpng/libpng15.patch delete mode 100644 community/glpng/license delete mode 100644 community/libgda4/PKGBUILD delete mode 100644 community/libgda4/libgda.install (limited to 'community') diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD index 5637d2a22..d618abfa3 100644 --- a/community/chromium-bsu/PKGBUILD +++ b/community/chromium-bsu/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 77622 2012-10-13 11:41:22Z allan $ +# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $ # Maintainer: Allan McRae # Contributor: William Rea pkgname=chromium-bsu pkgver=0.9.15 -pkgrel=3 +pkgrel=4 pkgdesc="A fast paced top scrolling shooter" arch=('i686' 'x86_64') url="http://chromium-bsu.sourceforge.net/" license=('custom:artistic') -depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') +depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image') install=chromium-bsu.install source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('d57137a1ac2292363b35192724c7e3be') diff --git a/community/glpng/Makefile b/community/glpng/Makefile deleted file mode 100644 index d6772798f..000000000 --- a/community/glpng/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -CFLAGS+=-fPIC -Iinclude -LDFLAGS+=-lpng -lGL -SHAREDLIBFLAGS=-shared -DESTDIR=/usr/local -LIB=lib - -all: libglpng.a libglpng.so.1.45 - -libglpng.a: glpng.o - ar rv $@ $< - -libglpng.so.1.45: glpng.o - gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@ - -glpng.o: src/glpng.c - gcc $(CFLAGS) -c $< - -clean: - rm glpng.o libglpng.* - -install: - for i in include include/GL $(LIB); do \ - install -m 755 -d $(DESTDIR)/$$i; \ - done - install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL - install -m 755 libglpng.* $(DESTDIR)/$(LIB) - ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1 - ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so - -.PHONY: clean install diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD deleted file mode 100644 index 0c604e544..000000000 --- a/community/glpng/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 63590 2012-02-05 11:58:33Z ibiru $ -# Maintainer: Allan McRae - -pkgname=glpng -pkgver=1.45 -pkgrel=5 -pkgdesc="Toolkit for loading PNG images as OpenGL textures" -arch=('i686' 'x86_64') -url="http://www.fifi.org/doc/libglpng-dev/glpng.html" -license=('custom') -depends=('libpng' 'libgl') -makedepends=('mesa') -source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz - Makefile - libpng15.patch - license) -build() { - cd "$srcdir/libglpng-1.45.orig" - - patch -Np1 -i "$srcdir/libpng15.patch" - - cp "$srcdir/Makefile" . - make libglpng.so.1.45 -} - -package() { - cd "$srcdir/libglpng-1.45.orig" - make DESTDIR="$pkgdir/usr" install - install -Dm644 "$srcdir/license" \ - "$pkgdir/usr/share/licenses/glpng/license" -} -md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' - '0b24e9cb527d4ed1c43dd743d49d2b54' - 'f3f0c0a3f867c5856d922c18677ef2a2' - 'cd066652a6e5dbd7c1fc303b8e03417a') diff --git a/community/glpng/libpng15.patch b/community/glpng/libpng15.patch deleted file mode 100644 index 89e9bf67e..000000000 --- a/community/glpng/libpng15.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h ---- libglpng-1.45.orig/include/GL/glpng.h 2000-07-10 21:27:00.000000000 +0200 -+++ libglpng-1.45.new/include/GL/glpng.h 2012-01-19 19:34:43.994280259 +0100 -@@ -57,7 +57,7 @@ - #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS - - /* Transparency parameters */ --#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ -+#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */ - #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ - #define PNG_SOLID -1 /* No transparency */ - #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ -diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c ---- libglpng-1.45.orig/src/glpng.c 2000-07-10 21:27:10.000000000 +0200 -+++ libglpng-1.45.new/src/glpng.c 2012-01-19 19:39:37.379311651 +0100 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include "png/png.h" -+#include - - /* Used to decide if GL/gl.h supports the paletted extension */ - #ifdef GL_COLOR_INDEX1_EXT -@@ -113,6 +113,7 @@ - } - } - -+#ifdef _WIN32 - static int ExtSupported(const char *x) { - static const GLubyte *ext = NULL; - const char *c; -@@ -129,6 +130,7 @@ - - return 0; - } -+#endif - - #define GET(o) ((int)*(data + (o))) - -@@ -269,14 +271,14 @@ - if (pinfo == NULL) return 0; - - fread(header, 1, 8, fp); -- if (!png_check_sig(header, 8)) return 0; -+ if (!png_sig_cmp(header, 0, 8)) return 0; - - png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct(png); - endinfo = png_create_info_struct(png); - - // DH: added following lines -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf(png))) - { - png_destroy_read_struct(&png, &info, &endinfo); - return 0; -@@ -373,14 +375,14 @@ - png_uint_32 i; - - fread(header, 1, 8, fp); -- if (!png_check_sig(header, 8)) return 0; -+ if (png_sig_cmp(header, 0, 8)) return 0; - - png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct(png); - endinfo = png_create_info_struct(png); - - // DH: added following lines -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf(png))) - { - png_destroy_read_struct(&png, &info, &endinfo); - return 0; -@@ -559,7 +561,7 @@ - #define ALPHA *q - - switch (trans) { -- case PNG_CALLBACK: -+ case PNG_CALLBACKT: - FORSTART - ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); - FOREND diff --git a/community/glpng/license b/community/glpng/license deleted file mode 100644 index a526262b5..000000000 --- a/community/glpng/license +++ /dev/null @@ -1,21 +0,0 @@ -/* - * PNG loader library for OpenGL v1.45 (10/07/00) - * by Ben Wyatt ben@wyatt100.freeserve.co.uk - * Using LibPNG 1.0.2 and ZLib 1.1.3 - * - * This software is provided 'as-is', without any express or implied warranty. - * In no event will the author be held liable for any damages arising from the - * use of this software. - * - * Permission is hereby granted to use, copy, modify, and distribute this - * source code, or portions hereof, for any purpose, without fee, subject to - * the following restrictions: - * - * 1. The origin of this source code must not be misrepresented. You must not - * claim that you wrote the original software. If you use this software in - * a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered versions must be plainly marked as such and must not be - * misrepresented as being the original source. - * 3. This notice must not be removed or altered from any source distribution. - */ diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 330a87a86..15518c6c7 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80124 2012-11-16 17:08:40Z kkeen $ +# $Id: PKGBUILD 85759 2013-03-06 14:22:48Z kkeen $ # Maintainer: Kyle Keen # Contributor: Marq Schneider pkgname=kicad -pkgver=20120119 +pkgver=20130226 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} -_pkgbzr=3256 +_pkgbzr=3974 pkgrel=4 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') @@ -16,16 +16,21 @@ makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install -source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources-$_pkgver-BZR$_pkgbzr-stable.zip +source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources_stable_${_pkgver}_BZR${_pkgbzr}.zip kicad-boost-polygon-declare-gtlsort-earlier.patch) -md5sums=('d65574c42efd72638aed80adef367c3b' +md5sums=('9b7748efedc355473c72fdb7c37b0500' 'a2c39704238946e74a5ed0c38326345f') build() { - cd "$srcdir/KiCad_sources" + cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}" patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch" + # harmless build blocking error + # see https://lists.launchpad.net/kicad-developers/msg07841.html + # for proper fix + sed -i 's|^#.*error "You must use|//&|' include/common.h + # FS#31559 sed -i 's/-O2/-O1/' CMakeLists.txt @@ -39,10 +44,11 @@ build() { } package() { - cd "$srcdir/KiCad_sources/build/Release" + cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}/build/Release" make DESTDIR="$pkgdir" install # copy updated linux icons #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/" } + diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD deleted file mode 100644 index 080555e83..000000000 --- a/community/libgda4/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 57409 2011-10-27 03:51:27Z ebelanger $ -# Maintainer: tobias -# Contributor: Tobias Kieslich - -pkgname=libgda4 -pkgver=4.2.10 -pkgrel=1 -pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtksourceview2' 'libunique' 'libxslt' 'libsoup' - 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' - 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('intltool' 'gobject-introspection' ) -options=('!libtool') -url="http://www.gnome-db.org" -install=libgda.install -source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz) -sha256sums=('cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431') - -build() { - cd "${srcdir}/libgda-${pkgver}" - sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-bdb=/usr --with-bdb-libdir-name=lib \ - --disable-static \ - --disable-gtk-doc - make -} - -package() { - cd "${srcdir}/libgda-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "$pkgdir/usr/share/icons" - rm -rf "$pkgdir/usr/share/gtk-doc" - rm -rf "$pkgdir"/usr/bin/{gda-list-config,gda-list-server-op,gda-sql} - rm -rf "$pkgdir"/usr/share/man/man1/gda-sql.1 -} diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install deleted file mode 100644 index eb5d48353..000000000 --- a/community/libgda4/libgda.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/libgda-4.0/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.3-54-g00ecf