office/texmaker: Updated for version 1.9.9.

5 files changed, 23 insertions, 21 deletions

diff --git a/office/texmaker/README b/office/texmaker/README
index 836997f2a603..7171b160a65c 100644
--- a/office/texmaker/README
+++ b/office/texmaker/README
@@ -1,3 +1,3 @@
 Texmaker is a free LaTeX editor that integrates many
 tools needed to develop documents with LaTeX in just
-one application.
\ No newline at end of file
+one application.
diff --git a/office/texmaker/doinst.sh b/office/texmaker/doinst.sh
index 4e8ba7071dea..1f8ff67dedb2 100644
--- a/office/texmaker/doinst.sh
+++ b/office/texmaker/doinst.sh
@@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/office/texmaker/focus.patch b/office/texmaker/focus.patch
deleted file mode 100644
index dfbafc0d8f99..000000000000
--- a/office/texmaker/focus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- texmaker-1.9/texmaker.cpp.orig	2009-05-21 12:56:32.047389802 -0300
-+++ texmaker-1.9/texmaker.cpp	2009-05-21 12:56:33.936554284 -0300
-@@ -402,6 +402,8 @@
- CentralLayout->setMargin(0);
- CentralLayout->addWidget(centralToolBar);
- EditorView=new QTabWidget(centralFrame);
-+EditorView->setFocusPolicy(Qt::ClickFocus);
-+EditorView->setFocus();
- EditorView->setTabsClosable(true);
- connect(EditorView, SIGNAL( currentChanged( int ) ), this, SLOT(UpdateCaption()) );
- CentralLayout->addWidget(EditorView);
diff --git a/office/texmaker/texmaker.SlackBuild b/office/texmaker/texmaker.SlackBuild
index 7cb31a7ae358..3dc06115eaa8 100644
--- a/office/texmaker/texmaker.SlackBuild
+++ b/office/texmaker/texmaker.SlackBuild
@@ -5,9 +5,9 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=texmaker
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-1.9.9}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -41,8 +41,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/focus.patch
-
 qmake -unix PREFIX=/usr -o Makefile $PRGNAM.pro
 
 make \
@@ -54,13 +52,22 @@ make install INSTALL_ROOT=$PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 mkdir -p $PKG/usr/man/man1
 install -m 0644 $CWD/$PRGNAM.1 $PKG/usr/man/man1
 gzip -9 $PKG/usr/man/man?/*.?
 
+for i in 16 22 32 48 64 128; do
+  install -D -m 0644 utilities/${PRGNAM}${i}x${i}.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
+done
+
+install -D -m 0644 utilities/$PRGNAM.svg \
+  $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
+rm -rf $PKG/usr/share/pixmaps
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   INSTALL utilities/{AUTHORS,CHANGELOG.txt,license.txt,COPYING} \
diff --git a/office/texmaker/texmaker.info b/office/texmaker/texmaker.info
index bccc1b467f28..894cd7388493 100644
--- a/office/texmaker/texmaker.info
+++ b/office/texmaker/texmaker.info
@@ -1,10 +1,10 @@
 PRGNAM="texmaker"
-VERSION="1.9.2"
+VERSION="1.9.9"
 HOMEPAGE="http://www.xm1math.net/texmaker/index.html"
-DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-1.9.2.tar.bz2"
-MD5SUM="61842ccacf7d843e497aa74f7135d04a"
+DOWNLOAD="http://www.xm1math.net/texmaker/texmaker-1.9.9.tar.bz2"
+MD5SUM="6a56af78aac811ec3a82e7d375d388ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED="dsomero"