diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
commit | 9b5c97532f512463af83f0daac1e9db22c3307c2 (patch) | |
tree | 582f514a154dea23be340cca8abe44a0bf95f132 /staging | |
parent | f8ec57e91051f85129d837252605854c888567d0 (diff) | |
parent | 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/cegui/PKGBUILD
community-staging/darktable/PKGBUILD
community-staging/freewrl/PKGBUILD
community-staging/gource/PKGBUILD
community-staging/openimageio/PKGBUILD
community-staging/rss-glx/PKGBUILD
community-staging/spring/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community/astromenace/PKGBUILD
extra/di/PKGBUILD
staging/opencv/PKGBUILD
testing/cairo/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/seahorse/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'staging')
-rw-r--r-- | staging/emacs/PKGBUILD | 41 | ||||
-rw-r--r-- | staging/emacs/emacs.install | 32 | ||||
-rw-r--r-- | staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff | 12 | ||||
-rw-r--r-- | staging/obex-data-server/PKGBUILD | 28 | ||||
-rw-r--r-- | staging/pstoedit/PKGBUILD | 34 | ||||
-rw-r--r-- | staging/pstoedit/pstoedit-3.50-parallel.patch | 47 | ||||
-rw-r--r-- | staging/pstoedit/pstoedit-3.50-plugin-close.patch | 14 |
7 files changed, 0 insertions, 208 deletions
diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD deleted file mode 100644 index 3fa2f0677..000000000 --- a/staging/emacs/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 169485 2012-10-22 00:40:50Z eric $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> - -pkgname=emacs -pkgver=24.2 -pkgrel=2 -pkgdesc="The extensible, customizable, self-documenting real-time display editor" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') -install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') - - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk3 --with-xft - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # remove conflict with ctags package - mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} - mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} - # fix all the 777 perms on directories - find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \; - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games -} diff --git a/staging/emacs/emacs.install b/staging/emacs/emacs.install deleted file mode 100644 index d84f1de14..000000000 --- a/staging/emacs/emacs.install +++ /dev/null @@ -1,32 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff deleted file mode 100644 index a33ec6f7f..000000000 --- a/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c ---- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200 -+++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200 -@@ -271,7 +271,7 @@ - gint err; - - ff_cleanup (o); -- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); -+err = avformat_open_input (&p->ic, o->path, NULL, NULL); - if (err < 0) - { - print_error (o->path, err); diff --git a/staging/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD deleted file mode 100644 index 32d465533..000000000 --- a/staging/obex-data-server/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 169396 2012-10-20 10:00:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Keerthi <keerthi.linux@gmail.com> - -pkgname=obex-data-server -pkgver=0.4.6 -pkgrel=3 -pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" -arch=('i686' 'x86_64') -url="http://wiki.muiline.com/obex-data-server" -license=('GPL') -depends=('dbus-glib' 'openobex' 'imagemagick') -source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('961ca5db6fe9c97024e133cc6203cc4d') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD deleted file mode 100644 index c8cfb6c43..000000000 --- a/staging/pstoedit/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 169481 2012-10-21 23:53:55Z eric $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Tobias Powalowski <t.powa@gmx.de> - -pkgname=pstoedit -pkgver=3.60 -pkgrel=3 -pkgdesc="Translates PostScript and PDF graphics into other vector formats" -arch=('i686' 'x86_64') -url="http://www.pstoedit.net/" -license=('GPL') -depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') -makedepends=('ghostscript') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz" - 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch') -sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2' - '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a' - '54bbe019de66eb4cb8525371462595d21fbd074e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's/-pedantic//' configure - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch deleted file mode 100644 index 4f1f73b04..000000000 --- a/staging/pstoedit/pstoedit-3.50-parallel.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index d6178df..66f377b 100755 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \ - $(sample_drivers_src) - libp2edrvstd_la_LIBADD=-L. libpstoedit.la - libp2edrvstd_la_LDFLAGS=-no-undefined -module -+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la - - #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp - #libp2edrvplugins_la_LIBADD= -@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module - libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp - libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la - libp2edrvlplot_la_LDFLAGS=-no-undefined -module -+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la - - libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp - libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la - libp2edrvswf_la_LDFLAGS=-no-undefined -module -+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la - - # note the __ stand for ++ - automake treats all no alphanums chars as _ - libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp - libp2edrvmagick___la_LIBADD=-L. libpstoedit.la - libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module -+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la - # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long - - if USE_EMFBYSOURCE -@@ -113,6 +117,7 @@ else - libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp - libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module - endif -+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la - - libpstoedit_la_SOURCES = \ - dynload.cpp dynload.h \ -@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined - - pstoedit_SOURCES = cmdmain.cpp - pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS} -+pstoedit_DEPENDENCIES = libpstoedit.la - - pkginclude_HEADERS = \ - pstoedit.h \ diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch deleted file mode 100644 index 6787d6aef..000000000 --- a/staging/pstoedit/pstoedit-3.50-plugin-close.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugzilla.redhat.com/507035 - -diff --git a/src/dynload.cpp b/src/dynload.cpp -index c0db355..7c073ef 100644 ---- a/src/dynload.cpp -+++ b/src/dynload.cpp -@@ -147,7 +147,6 @@ void DynLoader::close() - - DynLoader::~DynLoader() - { -- close(); - libname=0; - } - |