summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9010a55d4737..fa39abbd0e52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caja-gtk2
- pkgdesc = File manager for the MATE desktop (GTK2 version)
+ pkgdesc = File manager for the MATE desktop (older GTK2 version)
pkgver = 1.16.6
- pkgrel = 1
+ pkgrel = 2
url = http://mate-desktop.org
arch = i686
arch = x86_64
@@ -14,12 +14,11 @@ pkgbase = caja-gtk2
depends = libexif
depends = libsm
depends = libunique
- depends = mate-desktop
- optdepends = gstreamer: automatic media playback when mouseover
+ depends = mate-desktop-gtk2
+ optdepends = gstreamer: automatic media playback on mouseover
provides = caja
conflicts = caja
source = http://pub.mate-desktop.org/releases/1.16/caja-1.16.6.tar.xz
sha1sums = 97f6ea82393e808f3809152ac4ba0afbb96bf380
pkgname = caja-gtk2
-
diff --git a/PKGBUILD b/PKGBUILD
index 1eed1288189b..8037ad4dce2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# Maintainer: Newb I the Newbd <czbd hostedon o2 halfacolon pl>
+# Maintainer: Czcibor Bohusz-Dobosz <czbd@o2.pl>
# Contributor: Martin Wimpress <code@flexion.org>
_ver=1.16
_pkgbase=caja
pkgname=${_pkgbase}-gtk2
pkgver=${_ver}.6
-pkgrel=1
-pkgdesc="File manager for the MATE desktop (GTK2 version)"
+pkgrel=2
+pkgdesc="File manager for the MATE desktop (older GTK2 version)"
url="http://mate-desktop.org"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop')
+depends=('exempi' 'gvfs' 'libexif' 'libsm' 'libunique' 'mate-desktop-gtk2')
makedepends=('gobject-introspection' 'intltool')
-optdepends=('gstreamer: automatic media playback when mouseover')
+optdepends=('gstreamer: automatic media playback on mouseover')
groups=('mate-gtk2')
conflicts=("${_pkgbase}")
provides=("${_pkgbase}")
@@ -31,7 +31,7 @@ build() {
#https://bugzilla.gnome.org/show_bug.cgi?id=656231
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ make LDFLAGS="-Wl,--allow-multiple-definition"
}
package() {