[arch-commits] Commit in mrxvt/repos (3 files)

[Eric Bélanger]

    Date: Thursday, March 5, 2009 @ 04:00:41
  Author: eric
Revision: 29077

Fixed svn conflict

Added:
  mrxvt/repos/extra-x86_64/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
    (from rev 29076, mrxvt/trunk/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch)
Modified:
  mrxvt/repos/extra-x86_64/	(properties)
  mrxvt/repos/extra-x86_64/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |   29 ++++++++++-----------
 mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch |   13 +++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)


Property changes on: mrxvt/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mrxvt/trunk:1
   + /mrxvt/trunk:1-29076

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-05 08:58:51 UTC (rev 29076)
+++ extra-x86_64/PKGBUILD	2009-03-05 09:00:41 UTC (rev 29077)
@@ -3,31 +3,30 @@
 # Contributor: twm
 
 pkgname=mrxvt
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Mrxvt (previously known as materm) is a multi-tabbed X terminal emulator based on rxvt code"
 arch=(i686 x86_64)
-url="http://materm.sourceforge.net/index.html"
-license=("GPL2")
+url="http://materm.sourceforge.net/wiki/pmwiki.php"
+license=('GPL')
 depends=('libpng' 'libjpeg' 'libxft' 'libxpm')
 replaces=('materm')
-source=(http://dl.sourceforge.net/sourceforge/materm/${pkgname}-${pkgver}.tar.gz \
-		  http://dl.sourceforge.net/sourceforge/materm/no-scroll-with-buffer-mrxvt-0.5.3.patch \
-        ${pkgname}.desktop)
-md5sums=('0dac39bef63a4a69eab35c027e8c5bdf' '9032af5f981b91462ed916d27ae286b9'\
+backup=('etc/mrxvt/mrxvtrc' 'etc/mrxvt/submenus.menu' 'etc/mrxvt/default.menu')
+source=(http://downloads.sourceforge.net/sourceforge/materm/${pkgname}-${pkgver}.tar.gz \
+        mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch mrxvt.desktop)
+md5sums=('0232c8868484751dcb931a28f0756f69' '2b6ecc9d68185e56a50eca0a2548fa8b'\
          '6ba3bcd484c8dad1b0b48465ded54de3')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ../no-scroll-with-buffer-mrxvt-0.5.3.patch || return 1
-   # mrxvt is not a default xterm emulator, let's add some fancy options here, ey
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p0 < ../mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch || return 1
+  # mrxvt is not a default xterm emulator, let's add some fancy options here, ey
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xft --enable-text-shadow \
     --enable-transparency --enable-smart-resize --enable-menubar \
-    --enable-ourstrings --enable-linespace --enable-256colors --enable-xim \
+    --disable-ourstrings --enable-linespace --enable-256colors --enable-xim \
     --enable-thai --enable-greek --enable-cjk --enable-backspace-key \
-    --with-save-lines=2048
+    --with-save-lines=2048 || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -Dm644 ../${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
+  make DESTDIR=${pkgdir} install || return 1
+  install -Dm644 ../mrxvt.desktop ${pkgdir}/usr/share/applications/mrxvt.desktop
 }

Copied: mrxvt/repos/extra-x86_64/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch (from rev 29076, mrxvt/trunk/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch)
===================================================================
--- extra-x86_64/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch	                        (rev 0)
+++ extra-x86_64/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch	2009-03-05 09:00:41 UTC (rev 29077)
@@ -0,0 +1,13 @@
+Index: src/tabbar.c
+===================================================================
+--- src/tabbar.c	(revision 337)
++++ src/tabbar.c	(working copy)
+@@ -1327,7 +1327,7 @@
+ 		if( p.we_wordc > 1)
+ 		    rxvt_msg( DBG_ERROR, DBG_TABBAR,
+ 			    "Too many words when expanding %s\n", cwdOption );
+-		else
++		else if( NOT_NULL( *p.we_wordv ) )
+ 		{
+ 		    filename = *p.we_wordv;
+