[arch-commits] Commit in f-spot/trunk (2 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Dec 9 13:27:06 UTC 2013
Date: Monday, December 9, 2013 @ 14:27:06
Author: jgc
Revision: 201360
upgpkg: f-spot 0.8.2-4
Fix compilation, compile with dmcs
Added:
f-spot/trunk/0004-Fix-build-error-with-recent_gtk-sharp.patch
Modified:
f-spot/trunk/PKGBUILD
--------------------------------------------------+
0004-Fix-build-error-with-recent_gtk-sharp.patch | 15 ++++++++
PKGBUILD | 39 +++++++++++++--------
2 files changed, 40 insertions(+), 14 deletions(-)
Added: 0004-Fix-build-error-with-recent_gtk-sharp.patch
===================================================================
--- 0004-Fix-build-error-with-recent_gtk-sharp.patch (rev 0)
+++ 0004-Fix-build-error-with-recent_gtk-sharp.patch 2013-12-09 13:27:06 UTC (rev 201360)
@@ -0,0 +1,15 @@
+from upstream git
+
+diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
+index b1e4993..63edd84 100644
+--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
++++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
+@@ -467,7 +467,7 @@ namespace FSpot {
+ bounds.Height = selector.background.Height;
+ bounds.Y = selector.background.Y;
+ bounds.X = selector.BoxX (item);
+- bounds.Width = Math.Max (selector.BoxX (item + 1) - bounds.X, 1);
++ bounds.Width = Math.Max (selector.BoxX (item + 1) - selector.BoxX (item), 1);
+
+ if (item < 0 || item > selector.box_counts.Length - 1)
+ return;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-09 12:44:37 UTC (rev 201359)
+++ PKGBUILD 2013-12-09 13:27:06 UTC (rev 201360)
@@ -5,42 +5,53 @@
pkgname=f-spot
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="A personal photo management program for GNOME"
url="http://www.gnome.org/projects/f-spot/"
arch=(i686 x86_64)
license=('GPL')
depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
+makedepends=('intltool' 'gnome-doc-utils')
install=$pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2
mono-2.8.patch
- flickrnet-3.0.patch)
+ flickrnet-3.0.patch
+ 0004-Fix-build-error-with-recent_gtk-sharp.patch)
sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
'4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
- 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
+ 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5'
+ 'a7f46b3fad59b8d81a329e51ca722373c82bcf664976b8bcb9618084307c81ec')
+prepare() {
+ mkdir .wabi
+
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../mono-2.8.patch
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=665063
+ patch -Np1 -i ../flickrnet-3.0.patch
+
+ # Patch from Debian
+ patch -Np1 -i ../0004-Fix-build-error-with-recent_gtk-sharp.patch
+}
+
build() {
export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/mono-2.8.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=665063
- patch -Np1 -i "${srcdir}/flickrnet-3.0.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ cd $pkgname-$pkgver
+ MCS=/usr/bin/dmcs ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \
+ --with-gnome-screensaver=/usr --with-gnome-screensaver-privlibexecdir=/usr/lib/gnome-screensaver \
--with-vendor-build-id=ArchLinux
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR=${pkgdir} install
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas
rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
More information about the arch-commits
mailing list