diff --git a/office/keepassx/keepassx-0.4.3-gcc47.patch b/office/keepassx/keepassx-0.4.3-gcc47.patch deleted file mode 100644 index 9e26e5a0a5..0000000000 --- a/office/keepassx/keepassx-0.4.3-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/lib/random.cpp b/src/lib/random.cpp -index 1007172..f12dd1c 100644 ---- a/src/lib/random.cpp -+++ b/src/lib/random.cpp -@@ -19,6 +19,7 @@ - ***************************************************************************/ - - #include "random.h" -+#include - - - #if defined(Q_WS_X11) || defined(Q_WS_MAC) diff --git a/office/keepassx/keepassx.SlackBuild b/office/keepassx/keepassx.SlackBuild index 88ee918599..97b462b8ae 100644 --- a/office/keepassx/keepassx.SlackBuild +++ b/office/keepassx/keepassx.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=keepassx -VERSION=${VERSION:-0.4.4} +VERSION=${VERSION:-2.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,20 +69,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/keepassx-0.4.3-gcc47.patch - -qmake \ - QMAKE_CFLAGS="$SLKCFLAGS" \ - QMAKE_CXXFLAGS="$SLKCFLAGS" +cmake \ + -DMAKE_CFLAGS="$SLKCFLAGS" \ + -DMAKE_CXXFLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make -make install INSTALL_ROOT=$PKG +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL changelog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING INSTALL CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/office/keepassx/keepassx.info b/office/keepassx/keepassx.info index f6d9b693cf..adb061544e 100644 --- a/office/keepassx/keepassx.info +++ b/office/keepassx/keepassx.info @@ -1,8 +1,8 @@ PRGNAM="keepassx" -VERSION="0.4.4" +VERSION="2.0.2" HOMEPAGE="http:///www.keepassx.org/" -DOWNLOAD="https://www.keepassx.org/releases/0.4.4/keepassx-0.4.4.tar.gz" -MD5SUM="6022ffe1e2c59fc6f1a47544417bb0b5" +DOWNLOAD="https://www.keepassx.org/releases/2.0.2/keepassx-2.0.2.tar.gz" +MD5SUM="65d098dff663768911847a1e92d0f01d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""