Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=e1b7d540081fd31984f8df7e9349dd97aa56607f
commit e1b7d540081fd31984f8df7e9349dd97aa56607f Author: Miklos Vajna <[email protected]> Date: Fri Sep 14 12:14:15 2012 +0200 cpm-0.23beta-3-x86_64 - rebuild with cdk>=20120323 diff --git a/source/apps-extra/cpm/FrugalBuild b/source/apps-extra/cpm/FrugalBuild index 1e687d2..2ad0b94 100644 --- a/source/apps-extra/cpm/FrugalBuild +++ b/source/apps-extra/cpm/FrugalBuild @@ -3,25 +3,29 @@ pkgname=cpm pkgver=0.23beta -pkgrel=2 +pkgrel=3 pkgdesc="Console Password Manager" _F_sourceforge_dirname="passwordms" Finclude sourceforge url="http://www.harry-b.de/dokuwiki/doku.php?id=harry:cpm"; -depends=('ncurses' 'libxml2' 'dotconf' 'cracklib' 'gpgme' 'cdk') +depends=('ncurses' 'libxml2' 'dotconf' 'cracklib' 'gpgme' 'cdk>=20120323') backup=(etc/cpmrc) groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('0c3b3b22627bbd0f20ed959c95065baf3fc4cd0d') +source=($source cdk-ncursesw.patch) +sha1sums=('0c3b3b22627bbd0f20ed959c95065baf3fc4cd0d' \ + '84ab3454d48d3c54f111161131a4c5689cf35f7e') options=('scriptlet') build() { # ignore diff result (it's ok if a few strings are missing from # translations) - Fcd + Fpatchall + autoconf || return 1 sed -i 's,diff -u current.txt new.txt,diff -u current.txt new.txt || :,' Makefile.in - Fbuild --with-crack-dict=/usr/lib/cracklib_dict + Fmake --with-crack-dict=/usr/lib/cracklib_dict + Fmakeinstall cp docs/* ./ Ffilerel conf/cpmrc-default /etc/cpmrc } diff --git a/source/apps-extra/cpm/cdk-ncursesw.patch b/source/apps-extra/cpm/cdk-ncursesw.patch new file mode 100644 index 0000000..b5daf3f --- /dev/null +++ b/source/apps-extra/cpm/cdk-ncursesw.patch @@ -0,0 +1,50 @@ +diff --git a/configure.in b/configure.in +index 3840ff2..0513b5f 100644 +--- a/configure.in ++++ b/configure.in +@@ -142,8 +142,8 @@ AC_CHECK_LIB(ncurses, initscr) + if test "${ac_cv_lib_ncurses_initscr}" != "yes"; then + AC_MSG_ERROR([can not find the ncurses library.]) + fi +-AC_CHECK_LIB(cdk, initCDKScreen) +-if test "${ac_cv_lib_cdk_initCDKScreen}" != "yes"; then ++AC_CHECK_LIB(cdkw, initCDKScreen) ++if test "${ac_cv_lib_cdkw_initCDKScreen}" != "yes"; then + AC_MSG_ERROR([can not find the cdk library.]) + fi + if test ${USE_CRACKLIB} == 1; then +@@ -187,7 +187,7 @@ if test ${INCOMPATIBLE} -gt 0; then + CDK_UNUSABLE=1 + + # this file only exists in v5 +- CDK_VERSION_H=`dirname "${CDK_H}"`"/cdk_version.h" ++ CDK_VERSION_H="/usr/include/cdk/cdk_version.h" + if test -f "${CDK_VERSION_H}"; then + CDK_VERSION=`grep "CDK_VERSION_PATCH" ${CDK_VERSION_H} | cut -d " " -f 3 | sed -e 's/"//g'` + AC_MSG_NOTICE([CDK version patch: ${CDK_VERSION}]) +diff --git a/interface_gui.h b/interface_gui.h +index bb659e6..abae3e5 100644 +--- a/interface_gui.h ++++ b/interface_gui.h +@@ -27,7 +27,7 @@ + /* ############################################################################# + * includes + */ +-#include <cdk/cdk.h> ++#include <cdk.h> + + + /* ############################################################################# +diff --git a/options.h b/options.h +index e4fb2a4..2e0f0be 100644 +--- a/options.h ++++ b/options.h +@@ -28,7 +28,7 @@ + * includes + */ + /* we need this for the version info only */ +-#include <cdk/cdk.h> ++#include <cdk.h> + + + /* ############################################################################# _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
