[arch-commits] Commit in gitg/repos (10 files)

Jan Steffens heftig at archlinux.org
Wed Oct 8 18:17:30 UTC 2014


    Date: Wednesday, October 8, 2014 @ 20:17:30
  Author: heftig
Revision: 224111

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

Added:
  gitg/repos/testing-i686/PKGBUILD
    (from rev 224110, gitg/trunk/PKGBUILD)
  gitg/repos/testing-i686/gitg.install
    (from rev 224110, gitg/trunk/gitg.install)
  gitg/repos/testing-i686/webkit2gtk-4.0.patch
    (from rev 224110, gitg/trunk/webkit2gtk-4.0.patch)
  gitg/repos/testing-x86_64/PKGBUILD
    (from rev 224110, gitg/trunk/PKGBUILD)
  gitg/repos/testing-x86_64/gitg.install
    (from rev 224110, gitg/trunk/gitg.install)
  gitg/repos/testing-x86_64/webkit2gtk-4.0.patch
    (from rev 224110, gitg/trunk/webkit2gtk-4.0.patch)
Deleted:
  gitg/repos/testing-i686/PKGBUILD
  gitg/repos/testing-i686/gitg.install
  gitg/repos/testing-x86_64/PKGBUILD
  gitg/repos/testing-x86_64/gitg.install

-------------------------------------+
 /PKGBUILD                           |   78 ++++++++++++++++++++++++++++++++++
 /gitg.install                       |   26 +++++++++++
 testing-i686/PKGBUILD               |   27 -----------
 testing-i686/gitg.install           |   13 -----
 testing-i686/webkit2gtk-4.0.patch   |   12 +++++
 testing-x86_64/PKGBUILD             |   27 -----------
 testing-x86_64/gitg.install         |   13 -----
 testing-x86_64/webkit2gtk-4.0.patch |   12 +++++
 8 files changed, 128 insertions(+), 80 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2014-10-08 18:16:28 UTC (rev 224110)
+++ testing-i686/PKGBUILD	2014-10-08 18:17:30 UTC (rev 224111)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=gitg
-pkgver=3.14.0
-pkgrel=1
-pkgdesc='A GIT repository viewer based on GTK+'
-arch=('i686' 'x86_64')
-url='https://git.gnome.org/browse/gitg/'
-license=('GPL')
-depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkitgtk' 'libpeas' 'gtkspell3')
-makedepends=('intltool' 'vala' 'gobject-introspection' 'python2')
-groups=('gnome-extra')
-install=gitg.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make WARN_CFLAGS="-Wall"
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: gitg/repos/testing-i686/PKGBUILD (from rev 224110, gitg/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gitg
+pkgver=3.14.0
+pkgrel=2
+pkgdesc='A GIT repository viewer based on GTK+'
+arch=('i686' 'x86_64')
+url='https://git.gnome.org/browse/gitg/'
+license=('GPL')
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkit2gtk' 'libpeas' 'gtkspell3')
+makedepends=('intltool' 'vala' 'gobject-introspection' 'python2' 'gnome-common')
+groups=('gnome-extra')
+install=gitg.install
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
+        webkit2gtk-4.0.patch)
+sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b'
+            '3488adb8ea4ab40c1a8faa09d7c79e1933aa7667e3e6df2d644de750dc47d0d8')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../webkit2gtk-4.0.patch
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+
+  # Don't overlink
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make WARN_CFLAGS="-Wall"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: testing-i686/gitg.install
===================================================================
--- testing-i686/gitg.install	2014-10-08 18:16:28 UTC (rev 224110)
+++ testing-i686/gitg.install	2014-10-08 18:17:30 UTC (rev 224111)
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gitg/repos/testing-i686/gitg.install (from rev 224110, gitg/trunk/gitg.install)
===================================================================
--- testing-i686/gitg.install	                        (rev 0)
+++ testing-i686/gitg.install	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: gitg/repos/testing-i686/webkit2gtk-4.0.patch (from rev 224110, gitg/trunk/webkit2gtk-4.0.patch)
===================================================================
--- testing-i686/webkit2gtk-4.0.patch	                        (rev 0)
+++ testing-i686/webkit2gtk-4.0.patch	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,12 @@
+diff -u gitg-3.14.0/Gitg-1.0.gir gitg-3.14.0-webkit/Gitg-1.0.gir
+--- gitg-3.14.0/Gitg-1.0.gir	2014-08-20 11:26:30.000000000 +0200
++++ gitg-3.14.0-webkit/Gitg-1.0.gir	2014-10-08 19:49:50.285616042 +0200
+@@ -10,7 +10,7 @@
+ <include name="cairo" version="1.0"/>
+ <include name="Gdk" version="3.0"/>
+ <include name="GdkPixbuf" version="2.0"/>
+-<include name="WebKit2" version="3.0"/>
++<include name="WebKit2" version="4.0"/>
+ <include name="Soup" version="2.4"/>
+ <package name="libgitg/libgitg-1.0"/>
+ <c:include name="libgitg/libgitg.h"/>

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2014-10-08 18:16:28 UTC (rev 224110)
+++ testing-x86_64/PKGBUILD	2014-10-08 18:17:30 UTC (rev 224111)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=gitg
-pkgver=3.14.0
-pkgrel=1
-pkgdesc='A GIT repository viewer based on GTK+'
-arch=('i686' 'x86_64')
-url='https://git.gnome.org/browse/gitg/'
-license=('GPL')
-depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkitgtk' 'libpeas' 'gtkspell3')
-makedepends=('intltool' 'vala' 'gobject-introspection' 'python2')
-groups=('gnome-extra')
-install=gitg.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make WARN_CFLAGS="-Wall"
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: gitg/repos/testing-x86_64/PKGBUILD (from rev 224110, gitg/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gitg
+pkgver=3.14.0
+pkgrel=2
+pkgdesc='A GIT repository viewer based on GTK+'
+arch=('i686' 'x86_64')
+url='https://git.gnome.org/browse/gitg/'
+license=('GPL')
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'libgit2-glib' 'libgee' 'webkit2gtk' 'libpeas' 'gtkspell3')
+makedepends=('intltool' 'vala' 'gobject-introspection' 'python2' 'gnome-common')
+groups=('gnome-extra')
+install=gitg.install
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz
+        webkit2gtk-4.0.patch)
+sha256sums=('8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b'
+            '3488adb8ea4ab40c1a8faa09d7c79e1933aa7667e3e6df2d644de750dc47d0d8')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../webkit2gtk-4.0.patch
+  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+
+  # Don't overlink
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make WARN_CFLAGS="-Wall"
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: testing-x86_64/gitg.install
===================================================================
--- testing-x86_64/gitg.install	2014-10-08 18:16:28 UTC (rev 224110)
+++ testing-x86_64/gitg.install	2014-10-08 18:17:30 UTC (rev 224111)
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gitg/repos/testing-x86_64/gitg.install (from rev 224110, gitg/trunk/gitg.install)
===================================================================
--- testing-x86_64/gitg.install	                        (rev 0)
+++ testing-x86_64/gitg.install	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: gitg/repos/testing-x86_64/webkit2gtk-4.0.patch (from rev 224110, gitg/trunk/webkit2gtk-4.0.patch)
===================================================================
--- testing-x86_64/webkit2gtk-4.0.patch	                        (rev 0)
+++ testing-x86_64/webkit2gtk-4.0.patch	2014-10-08 18:17:30 UTC (rev 224111)
@@ -0,0 +1,12 @@
+diff -u gitg-3.14.0/Gitg-1.0.gir gitg-3.14.0-webkit/Gitg-1.0.gir
+--- gitg-3.14.0/Gitg-1.0.gir	2014-08-20 11:26:30.000000000 +0200
++++ gitg-3.14.0-webkit/Gitg-1.0.gir	2014-10-08 19:49:50.285616042 +0200
+@@ -10,7 +10,7 @@
+ <include name="cairo" version="1.0"/>
+ <include name="Gdk" version="3.0"/>
+ <include name="GdkPixbuf" version="2.0"/>
+-<include name="WebKit2" version="3.0"/>
++<include name="WebKit2" version="4.0"/>
+ <include name="Soup" version="2.4"/>
+ <package name="libgitg/libgitg-1.0"/>
+ <c:include name="libgitg/libgitg.h"/>



More information about the arch-commits mailing list