[arch-commits] Commit in tomboy/repos (12 files)
Jan de Groot
jgc at archlinux.org
Thu Feb 26 13:53:56 UTC 2015
Date: Thursday, February 26, 2015 @ 14:53:56
Author: jgc
Revision: 231994
db-move: moved tomboy from [staging] to [extra] (i686, x86_64)
Added:
tomboy/repos/extra-i686/PKGBUILD
(from rev 231993, tomboy/repos/staging-i686/PKGBUILD)
tomboy/repos/extra-i686/tomboy.install
(from rev 231993, tomboy/repos/staging-i686/tomboy.install)
tomboy/repos/extra-i686/use_dbussharp_2.patch
(from rev 231993, tomboy/repos/staging-i686/use_dbussharp_2.patch)
tomboy/repos/extra-x86_64/PKGBUILD
(from rev 231993, tomboy/repos/staging-x86_64/PKGBUILD)
tomboy/repos/extra-x86_64/tomboy.install
(from rev 231993, tomboy/repos/staging-x86_64/tomboy.install)
tomboy/repos/extra-x86_64/use_dbussharp_2.patch
(from rev 231993, tomboy/repos/staging-x86_64/use_dbussharp_2.patch)
Deleted:
tomboy/repos/extra-i686/PKGBUILD
tomboy/repos/extra-i686/tomboy.install
tomboy/repos/extra-x86_64/PKGBUILD
tomboy/repos/extra-x86_64/tomboy.install
tomboy/repos/staging-i686/
tomboy/repos/staging-x86_64/
------------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++++++++++++
/tomboy.install | 50 +++++++++++++++++++
extra-i686/PKGBUILD | 36 --------------
extra-i686/tomboy.install | 25 ---------
extra-i686/use_dbussharp_2.patch | 27 ++++++++++
extra-x86_64/PKGBUILD | 36 --------------
extra-x86_64/tomboy.install | 25 ---------
extra-x86_64/use_dbussharp_2.patch | 27 ++++++++++
8 files changed, 192 insertions(+), 122 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-26 09:02:45 UTC (rev 231993)
+++ extra-i686/PKGBUILD 2015-02-26 13:53:56 UTC (rev 231994)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=tomboy
-pkgver=1.14.1
-pkgrel=1
-pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
-options=('!emptydirs' '!makeflags')
-install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018')
-
-build() {
- export MONO_SHARED_DIR="$srcdir/.wabi"
- mkdir -p "$MONO_SHARED_DIR"
-
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
- install -m755 -d "$pkgdir/usr/share/gconf/schemas"
- gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas
- rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
Copied: tomboy/repos/extra-i686/PKGBUILD (from rev 231993, tomboy/repos/staging-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=tomboy
+pkgver=1.14.1
+pkgrel=2
+pkgdesc="Desktop note-taking application for Linux and Unix"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/tomboy/"
+depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
+options=('!emptydirs' '!makeflags')
+install=tomboy.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ use_dbussharp_2.patch)
+sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018'
+ 'ef6804f9f461f4c61d0d4ab514936f423f4a58b7d4606d576a8c62162f9acf9e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../use_dbussharp_2.patch
+}
+
+build() {
+ export MONO_SHARED_DIR="$srcdir/.wabi"
+ mkdir -p "$MONO_SHARED_DIR"
+
+ cd "$pkgname-$pkgver"
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
Deleted: extra-i686/tomboy.install
===================================================================
--- extra-i686/tomboy.install 2015-02-26 09:02:45 UTC (rev 231993)
+++ extra-i686/tomboy.install 2015-02-26 13:53:56 UTC (rev 231994)
@@ -1,25 +0,0 @@
-pkgname=tomboy
-
-post_install() {
- gconfpkg --install ${pkgname}
-
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime
-}
Copied: tomboy/repos/extra-i686/tomboy.install (from rev 231993, tomboy/repos/staging-i686/tomboy.install)
===================================================================
--- extra-i686/tomboy.install (rev 0)
+++ extra-i686/tomboy.install 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,25 @@
+pkgname=tomboy
+
+post_install() {
+ gconfpkg --install ${pkgname}
+
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime
+}
Copied: tomboy/repos/extra-i686/use_dbussharp_2.patch (from rev 231993, tomboy/repos/staging-i686/use_dbussharp_2.patch)
===================================================================
--- extra-i686/use_dbussharp_2.patch (rev 0)
+++ extra-i686/use_dbussharp_2.patch 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,27 @@
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in 2014-01-09 10:41:48.213622716 +0000
++++ tomboy/configure.in 2014-01-09 10:41:48.209622716 +0000
+@@ -175,7 +175,7 @@
+ #
+ # Check for dbus-sharp
+ #
+-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
++PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.4 dbus-sharp-glib-2.0 >= 0.3)
+ AC_SUBST(DBUS_LIBS)
+
+ #
+Index: tomboy/Tomboy/RemoteControlProxy.cs
+===================================================================
+--- tomboy.orig/Tomboy/RemoteControlProxy.cs 2013-10-27 23:42:50.649722383 +0000
++++ tomboy/Tomboy/RemoteControlProxy.cs 2014-01-09 10:42:13.273621654 +0000
+@@ -55,8 +55,7 @@
+ return null;
+
+ RemoteControl remote_control = new RemoteControl (manager);
+- Bus.Session.Register (Namespace,
+- new ObjectPath (Path),
++ Bus.Session.Register (new ObjectPath (Path),
+ remote_control);
+ return remote_control;
+ #else
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-26 09:02:45 UTC (rev 231993)
+++ extra-x86_64/PKGBUILD 2015-02-26 13:53:56 UTC (rev 231994)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=tomboy
-pkgver=1.14.1
-pkgrel=1
-pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
-options=('!emptydirs' '!makeflags')
-install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018')
-
-build() {
- export MONO_SHARED_DIR="$srcdir/.wabi"
- mkdir -p "$MONO_SHARED_DIR"
-
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
- install -m755 -d "$pkgdir/usr/share/gconf/schemas"
- gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas
- rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
Copied: tomboy/repos/extra-x86_64/PKGBUILD (from rev 231993, tomboy/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=tomboy
+pkgver=1.14.1
+pkgrel=2
+pkgdesc="Desktop note-taking application for Linux and Unix"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/tomboy/"
+depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
+options=('!emptydirs' '!makeflags')
+install=tomboy.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ use_dbussharp_2.patch)
+sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018'
+ 'ef6804f9f461f4c61d0d4ab514936f423f4a58b7d4606d576a8c62162f9acf9e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../use_dbussharp_2.patch
+}
+
+build() {
+ export MONO_SHARED_DIR="$srcdir/.wabi"
+ mkdir -p "$MONO_SHARED_DIR"
+
+ cd "$pkgname-$pkgver"
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+}
Deleted: extra-x86_64/tomboy.install
===================================================================
--- extra-x86_64/tomboy.install 2015-02-26 09:02:45 UTC (rev 231993)
+++ extra-x86_64/tomboy.install 2015-02-26 13:53:56 UTC (rev 231994)
@@ -1,25 +0,0 @@
-pkgname=tomboy
-
-post_install() {
- gconfpkg --install ${pkgname}
-
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime
-}
Copied: tomboy/repos/extra-x86_64/tomboy.install (from rev 231993, tomboy/repos/staging-x86_64/tomboy.install)
===================================================================
--- extra-x86_64/tomboy.install (rev 0)
+++ extra-x86_64/tomboy.install 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,25 @@
+pkgname=tomboy
+
+post_install() {
+ gconfpkg --install ${pkgname}
+
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime
+}
Copied: tomboy/repos/extra-x86_64/use_dbussharp_2.patch (from rev 231993, tomboy/repos/staging-x86_64/use_dbussharp_2.patch)
===================================================================
--- extra-x86_64/use_dbussharp_2.patch (rev 0)
+++ extra-x86_64/use_dbussharp_2.patch 2015-02-26 13:53:56 UTC (rev 231994)
@@ -0,0 +1,27 @@
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in 2014-01-09 10:41:48.213622716 +0000
++++ tomboy/configure.in 2014-01-09 10:41:48.209622716 +0000
+@@ -175,7 +175,7 @@
+ #
+ # Check for dbus-sharp
+ #
+-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
++PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.4 dbus-sharp-glib-2.0 >= 0.3)
+ AC_SUBST(DBUS_LIBS)
+
+ #
+Index: tomboy/Tomboy/RemoteControlProxy.cs
+===================================================================
+--- tomboy.orig/Tomboy/RemoteControlProxy.cs 2013-10-27 23:42:50.649722383 +0000
++++ tomboy/Tomboy/RemoteControlProxy.cs 2014-01-09 10:42:13.273621654 +0000
+@@ -55,8 +55,7 @@
+ return null;
+
+ RemoteControl remote_control = new RemoteControl (manager);
+- Bus.Session.Register (Namespace,
+- new ObjectPath (Path),
++ Bus.Session.Register (new ObjectPath (Path),
+ remote_control);
+ return remote_control;
+ #else
More information about the arch-commits
mailing list