[arch-commits] Commit in sdcv/trunk (PKGBUILD sdcv-0.4.2-headers.patch sdcv.changelog)

[Jaroslav Lichtblau]

    Date: Sunday, May 1, 2016 @ 16:25:52
  Author: jlichtblau
Revision: 173261

upgpkg: sdcv 0.5.0beta4-1 - new upstream release

Modified:
  sdcv/trunk/PKGBUILD
  sdcv/trunk/sdcv.changelog
Deleted:
  sdcv/trunk/sdcv-0.4.2-headers.patch

--------------------------+
 PKGBUILD                 |   30 +++++++++++------------------
 sdcv-0.4.2-headers.patch |   46 ---------------------------------------------
 sdcv.changelog           |    7 ++++--
 3 files changed, 17 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-01 12:48:09 UTC (rev 173260)
+++ PKGBUILD	2016-05-01 14:25:52 UTC (rev 173261)
@@ -1,39 +1,33 @@
 # $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
 
 pkgname=sdcv
-pkgver=0.4.2
-pkgrel=9
+pkgver=0.5.0beta4
+pkgrel=1
 pkgdesc="StarDict Console Version"
 arch=('i686' 'x86_64')
 url="http://sdcv.sourceforge.net/"
 license=('GPL')
 depends=('glib2' 'readline' 'zlib')
-makedepends=('patch')
+makedepends=('cmake')
 provides=('stardict')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
-        $pkgname-$pkgver-headers.patch)
-sha256sums=('a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2'
-            '4746e32a6aaddf7744f373b539879598b48219a3b35f41ceb839f04c27921eb4')
+source=(https://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-0.5.0-beta4-Source.tar.bz2)
+sha256sums=('19e7ec25de76fc877d35d25542080907b4f89e44d8746f704a24304155483bad')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-0.5.0-beta4-Source
 
-  patch -Np1 -i "${srcdir}"/$pkgname-$pkgver-headers.patch
+  mkdir build
+  cd build
 
-  ./configure --prefix=/usr  --mandir=/usr/share/man
-
-#quick fix for x86_64
-  if [ "${CARCH}" == "x86_64" ]; then
-    sed -i 's|guint32 page_size|guint64 page_size|' src/lib/lib.cpp
-  fi
-
+  cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
   make
+  make lang
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd "${srcdir}"/$pkgname-0.5.0-beta4-Source/build
 
   make DESTDIR="${pkgdir}" install
 }

Deleted: sdcv-0.4.2-headers.patch
===================================================================
--- sdcv-0.4.2-headers.patch	2016-05-01 12:48:09 UTC (rev 173260)
+++ sdcv-0.4.2-headers.patch	2016-05-01 14:25:52 UTC (rev 173261)
@@ -1,46 +0,0 @@
-diff -ruN sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
---- sdcv-0.4.2-orig/src/lib/lib.cpp	2006-04-24 10:17:27.000000000 +0200
-+++ sdcv-0.4.2/src/lib/lib.cpp	2009-12-19 21:15:37.000000000 +0100
-@@ -513,7 +513,7 @@
- {
- 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
- 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
--	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
-+	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
- 	return wordentry_buf;
- }
-
-diff -ruN sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
---- sdcv-0.4.2-orig/src/libwrapper.cpp	2006-04-24 12:40:29.000000000 +0200
-+++ sdcv-0.4.2/src/libwrapper.cpp	2009-12-19 21:15:37.000000000 +0100
-@@ -24,6 +24,7 @@
- 
- #include <glib/gi18n.h>
- #include <map>
-+#include <cstring>
- 
- #include "utils.hpp"
- 
-diff -ruN sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
---- sdcv-0.4.2-orig/src/readline.cpp	2005-12-07 23:07:23.000000000 +0100
-+++ sdcv-0.4.2/src/readline.cpp	2009-12-19 21:15:37.000000000 +0100
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <cstdio>
-+#include <cstdlib>
- #ifdef WITH_READLINE
- #  include <readline/readline.h>
- #  include <readline/history.h>
-diff -ruN sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
---- sdcv-0.4.2-orig/src/utils.cpp	2006-04-24 11:03:47.000000000 +0200
-+++ sdcv-0.4.2/src/utils.cpp	2009-12-19 21:15:37.000000000 +0100
-@@ -22,6 +22,8 @@
- #  include "config.h"
- #endif
- 
-+#include <cstdio>
-+#include <cstdlib>
- #include <glib.h>
- #include <glib/gi18n.h>
- 

Modified: sdcv.changelog
===================================================================
--- sdcv.changelog	2016-05-01 12:48:09 UTC (rev 173260)
+++ sdcv.changelog	2016-05-01 14:25:52 UTC (rev 173261)
@@ -1,6 +1,9 @@
-2014-07-07 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* sdcv 0.5.0beta4-1
+
+2014-07-07 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* sdcv 0.4.2-8 mtree rebuild
 
-2011-10-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2011-10-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* sdcv 0.4.2-6
 	* moved to [community] with 206 votes