Fri Sep 2 23:14:49 UTC 2011

12 files changed, 143 insertions, 81 deletions

diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index becd8d5c6..e5df91d64 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118087 2011-04-05 12:00:37Z ibiru $
+# $Id: PKGBUILD 136800 2011-09-01 15:46:52Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
-pkgver=1.0.0
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ options=('!libtool')
 license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5d395218e30e2971dbf9ca69e564036e6b6316e2d995b93fef11c0195f136cdb')
+source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('044e46b4b36e71bd05f677639bbc5f8c6debd655e2ce69a8d937ed1b4e79d192')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 2f92da9a0..41a1bf574 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 131965 2011-07-18 13:37:20Z bisson $
+# $Id: PKGBUILD 136756 2011-09-01 08:20:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2"
         'qt4-lib64.patch')
-sha1sums=('36ed067b354abb1e0707a4b327e2ad624cb6f88d'
+sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405'
           '4307b0d7d6dc10f15909c94973c4357caf31de7e')
 
 install=install
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index c16f3285e..8072d5fa4 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135996 2011-08-21 08:10:46Z andyrtr $
+# $Id: PKGBUILD 136760 2011-09-01 10:56:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
 makedepends=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
+md5sums=('1f8c3b74b2c6faa9b08f84a422f93863')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index b059338a4..7449d6d04 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136649 2011-08-31 11:03:18Z jgc $
+# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,17 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
+        xid-collision-debug.patch
+        gtk2-dont-ellipsize-filters.diff)
 sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+    #https://bugzilla.gnome.org/show_bug.cgi?id=657949
+    patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -30,6 +34,7 @@ build() {
 
     make
 }
+
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install
diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
new file mode 100644
index 000000000..ff8dff6ef
--- /dev/null
+++ b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
@@ -0,0 +1,28 @@
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index 2ee7903..37d9e8d 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
+ static GtkWidget *
+ filter_create (GtkFileChooserDefault *impl)
+ {
+-  GtkCellRenderer *cell;
+-  GList           *cells;
+-
+   impl->filter_combo = gtk_combo_box_text_new ();
+   gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+ 
+-  /* Get the combo's text renderer and set ellipsize parameters */
+-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo));
+-  g_assert (cells);
+-  cell = cells->data;
+-
+-  g_object_set (G_OBJECT (cell),
+-		"ellipsize", PANGO_ELLIPSIZE_END,
+-		NULL);
+-
+-  g_list_free (cells);
+-
+   g_signal_connect (impl->filter_combo, "changed",
+ 		    G_CALLBACK (filter_combo_changed), impl);
+ 
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index 75c770b91..faa38a667 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120819 2011-04-26 16:19:33Z andyrtr $
+# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmspack
-pkgver=0.2alpha
+pkgver=0.3alpha
 pkgrel=1
 pkgdesc="A library for Microsoft compression formats"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=()
 options=('!libtool')
 source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz)
-md5sums=('a51c65ba1dc9b53090d4e65e1f55d860')
+md5sums=('08d08455b6d58ea649b35febd23f6386')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,6 +20,11 @@ build() {
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
new file mode 100644
index 000000000..802db0d91
--- /dev/null
+++ b/extra/p11-kit/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 136806 2011-09-01 17:14:51Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=p11-kit
+pkgver=0.5
+pkgrel=1
+pkgdesc="Library to work with PKCS#11 modules"
+arch=(i686 x86_64)
+url="http://p11-glue.freedesktop.org"
+license=('BSD')
+depends=(glibc)
+options=(!libtool)
+source=($url/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('1b4886ed4e6d25ab0b69e6350a804082')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 44a2cff98..54f406960 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
+# $Id: PKGBUILD 136831 2011-09-01 23:43:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@ options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
+        'qtconfig.desktop')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'dc7ed8c2e8c68a175f7f05a34dccc937')
+         '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
 	unset QMAKESPEC
@@ -37,9 +35,6 @@ build() {
 
 	cd $srcdir/$_pkgfqn
 
-    # Already fixed upstream
-    patch -p1 -i "${srcdir}"/qtbug-16292.patch
-	
     sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index 1d2fa1d4a..ce47107ce 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 125768 2011-05-29 12:37:27Z ibiru $
+# $Id: PKGBUILD 136819 2011-09-01 20:47:38Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
 pkgver=0.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Telepathy framework logging daemon"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Logger"
@@ -19,6 +19,7 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/telepathy \
+    --enable-call \
     --disable-static \
     --disable-scrollkeeper \
     --disable-schemas-compile
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 69e156492..d26b48d47 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 133479 2011-07-28 14:12:10Z heftig $
+# $Id: PKGBUILD 136823 2011-09-01 21:33:21Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=vim
-pkgname=(vim gvim vim-runtime)
+pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=266
+_patchlevel=289
 pkgver=${_topver}.${_patchlevel}
-__hgrev=124a81f12ca4
+__hgrev=ba9f075a347d
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
-             'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed')
+makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2'
+             'mercurial' 'rsync')
 source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
          'e57777374891063b9ca48a1fe392ac05'
          '10353a61aadc3f276692d0e17db1478e'
-         '63558c0b3509caea0d0f2b9274049c2a')
+         'd90413bd21f400313a785bb4010120cd')
 
 __hgroot='http://vim.googlecode.com/hg/'
 __hgrepo='vim'
@@ -31,7 +31,7 @@ _versiondir="vim${_topver//./}"
 ##### Build #####
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
 
   msg2 'Checking out source from Mercurial...'
 
@@ -70,7 +70,7 @@ build() {
 
   cp -a vim-build gvim-build
 
-  cd ${srcdir}/vim-build
+  cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
     --mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -81,14 +81,14 @@ build() {
 
   make
 
-  cd ${srcdir}/gvim-build
+  cd "${srcdir}"/gvim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
     --mandir=/usr/share/man --with-compiledby=ArchLinux \
     --with-features=big --enable-gpm --enable-acl --with-x=yes \
     --enable-gui=gtk2 --enable-multibyte --enable-cscope \
     --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --enable-rubyinterp
+    --enable-python3interp --enable-rubyinterp
 
   make
 }
@@ -100,14 +100,14 @@ package_vim() {
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
   conflicts=('gvim')
 
-  cd ${srcdir}/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/vim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
     cd ${_mandir}
     rm -f ex.1 view.1 # provided by (n)vi
@@ -115,84 +115,87 @@ package_vim() {
   done
 
   # Runtime provided by runtime package
-  rm -r ${pkgdir}/usr/share/vim
+  rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim/license.txt
+  install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_gvim() {
   pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
            'desktop-file-utils' 'gtk2')
   provides=("vim=${pkgver}-${pkgrel}")
   conflicts=('vim')
   install=gvim.install
 
-  cd ${srcdir}/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/gvim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
     cd ${_mandir}
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
   # Move the runtime for later packaging
-  mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
 
   # freedesktop links
-  install -Dm644 ${srcdir}/gvim.desktop \
-    ${pkgdir}/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+  install -Dm644 "${srcdir}"/gvim.desktop \
+    "${pkgdir}"/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/gvim
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/gvim/license.txt
+   install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
 package_vim-runtime() {
   pkgdesc='Runtime for vim and gvim'
-  backup=(etc/vimrc)
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
 
   # Install the runtime split from gvim
-  install -dm755 ${pkgdir}/usr/share
-  mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
 
   # Don't forget logtalk.dict
-  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
   sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
 
   # patch filetype.vim for better handling of pacman related files
   sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
   sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
 
   # make Aaron happy
-  install -Dm644 ${srcdir}/pythoncomplete.vim \
-    ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
+  install -Dm644 "${srcdir}"/pythoncomplete.vim \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
   
   # rc files
-  install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
-  install -Dm644 ${srcdir}/archlinux.vim \
-    ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm644 "${srcdir}"/archlinux.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+
+  # rgb.txt file
+  install -Dm644 "${srcdir}"/vim/runtime/rgb.txt \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime
+  install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
   ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    ${pkgdir}/usr/share/licenses/vim-runtime/license.txt
+    "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
 }
 
 # vim:set sw=2 sts=2 et:
diff --git a/extra/vim/gvim.desktop b/extra/vim/gvim.desktop
index 4f0d294ed..675357da5 100644
--- a/extra/vim/gvim.desktop
+++ b/extra/vim/gvim.desktop
@@ -58,7 +58,6 @@ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;tex
 Exec=gvim -f %F
 Icon=gvim
 Type=Application
-Terminal=0
+Terminal=false
 X-XClassHintResName=VIM
-MapNotify=false
 Categories=Utility;TextEditor;
diff --git a/extra/vim/gvim.install b/extra/vim/gvim.install
index 0a8d3b0a9..2eaa60550 100644
--- a/extra/vim/gvim.install
+++ b/extra/vim/gvim.install
@@ -1,7 +1,5 @@
 post_install() {
-  echo -n "Updating desktop and mime database..."
   update-desktop-database -q
-  echo "done."
 }
 
 post_upgrade() {