diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /extra/gedit | |
parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'extra/gedit')
-rw-r--r-- | extra/gedit/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/gedit/gedit.install | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index f368a16bb..a426b882a 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 146050 2012-01-04 17:54:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156780 2012-04-23 09:05:29Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.6 +pkgver=3.4.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('yelp-tools' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f') +sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-scrollkeeper \ - --disable-updater --disable-schemas-compile \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ --enable-python make } package(){ - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gedit/gedit.install b/extra/gedit/gedit.install index 9d88a1341..606920688 100644 --- a/extra/gedit/gedit.install +++ b/extra/gedit/gedit.install @@ -1,11 +1,11 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q } pre_upgrade() { - if [ -f usr/share/gconf/schemas/gedit.schemas ]; then - usr/sbin/gconfpkg --uninstall gedit + if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then + gconfpkg --uninstall gedit fi } |