[arch-commits] Commit in tomboy/repos (8 files)

Jan de Groot jgc at archlinux.org
Thu May 11 22:04:48 UTC 2017


    Date: Thursday, May 11, 2017 @ 22:04:45
  Author: jgc
Revision: 295849

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  tomboy/repos/extra-i686/PKGBUILD
    (from rev 295848, tomboy/trunk/PKGBUILD)
  tomboy/repos/extra-x86_64/PKGBUILD
    (from rev 295848, tomboy/trunk/PKGBUILD)
Deleted:
  tomboy/repos/extra-i686/PKGBUILD
  tomboy/repos/extra-i686/tomboy.install
  tomboy/repos/extra-i686/use_dbussharp_2.patch
  tomboy/repos/extra-x86_64/PKGBUILD
  tomboy/repos/extra-x86_64/tomboy.install
  tomboy/repos/extra-x86_64/use_dbussharp_2.patch

------------------------------------+
 /PKGBUILD                          |  106 +++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD                |   45 --------------
 extra-i686/tomboy.install          |   25 --------
 extra-i686/use_dbussharp_2.patch   |   27 --------
 extra-x86_64/PKGBUILD              |   45 --------------
 extra-x86_64/tomboy.install        |   25 --------
 extra-x86_64/use_dbussharp_2.patch |   27 --------
 7 files changed, 106 insertions(+), 194 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-i686/PKGBUILD	2017-05-11 22:04:45 UTC (rev 295849)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=tomboy
-pkgver=1.15.4
-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-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!emptydirs' '!makeflags')
-install=tomboy.install
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        use_dbussharp_2.patch)
-sha256sums=('1429790dbe7475850e753e9ac10bb1ea9f184f2142826c389da75930c093968b'
-            '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
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  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 295848, tomboy/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-05-11 22:04:45 UTC (rev 295849)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=tomboy
+pkgver=1.15.7
+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-glib' 'mono-addins' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils' git yelp-tools autoconf-archive)
+options=('!emptydirs' '!makeflags')
+_commit=6f031efb7e5a905704ef6ee877f5240a3b0a4a86  # tags/1.15.7^0
+source=("git+https://git.gnome.org/browse/tomboy#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd "$pkgname"
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --disable-update-mimedb
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd "$pkgname"
+  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	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-i686/tomboy.install	2017-05-11 22:04:45 UTC (rev 295849)
@@ -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
-}

Deleted: extra-i686/use_dbussharp_2.patch
===================================================================
--- extra-i686/use_dbussharp_2.patch	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-i686/use_dbussharp_2.patch	2017-05-11 22:04:45 UTC (rev 295849)
@@ -1,27 +0,0 @@
-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	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-x86_64/PKGBUILD	2017-05-11 22:04:45 UTC (rev 295849)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=tomboy
-pkgver=1.15.4
-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-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!emptydirs' '!makeflags')
-install=tomboy.install
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        use_dbussharp_2.patch)
-sha256sums=('1429790dbe7475850e753e9ac10bb1ea9f184f2142826c389da75930c093968b'
-            '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
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  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 295848, tomboy/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-05-11 22:04:45 UTC (rev 295849)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=tomboy
+pkgver=1.15.7
+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-glib' 'mono-addins' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils' git yelp-tools autoconf-archive)
+options=('!emptydirs' '!makeflags')
+_commit=6f031efb7e5a905704ef6ee877f5240a3b0a4a86  # tags/1.15.7^0
+source=("git+https://git.gnome.org/browse/tomboy#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd "$pkgname"
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var \
+      --disable-update-mimedb
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd "$pkgname"
+  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	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-x86_64/tomboy.install	2017-05-11 22:04:45 UTC (rev 295849)
@@ -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
-}

Deleted: extra-x86_64/use_dbussharp_2.patch
===================================================================
--- extra-x86_64/use_dbussharp_2.patch	2017-05-11 22:04:32 UTC (rev 295848)
+++ extra-x86_64/use_dbussharp_2.patch	2017-05-11 22:04:45 UTC (rev 295849)
@@ -1,27 +0,0 @@
-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