diff options
author | Eric Hameleers <alien@slackware.com> | 2017-10-14 19:32:17 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-10-14 19:35:08 +0200 |
commit | 6fb61f8ffaeea49cfcb7782b8abbe071c98a02dc (patch) | |
tree | 1bda9333de9c774bda1eae8fd5ad77eb3cf1e3c2 /kde | |
parent | f14fe8a81cc75ce1fb17dd2f7856d5f87ec2886a (diff) | |
download | ktown-6fb61f8ffaeea49cfcb7782b8abbe071c98a02dc.tar.gz ktown-6fb61f8ffaeea49cfcb7782b8abbe071c98a02dc.tar.xz |
perlqt: tried - unsuccessfully - to make it compile again
Diffstat (limited to 'kde')
-rw-r--r-- | kde/cmake/perlqt | 2 | ||||
-rw-r--r-- | kde/patch/perlqt.patch | 3 | ||||
-rw-r--r-- | kde/patch/perlqt/perlqt.gcc6.diff | 11 |
3 files changed, 16 insertions, 0 deletions
diff --git a/kde/cmake/perlqt b/kde/cmake/perlqt index 670c028..ddfaeb9 100644 --- a/kde/cmake/perlqt +++ b/kde/cmake/perlqt @@ -14,6 +14,8 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \ + -DQSCINTILLA_LIBRARY=/usr/lib$LIBDIRSUFFIX/libqscintilla2_qt4.so \ + -DWITH_Qwt5:BOOL=OFF \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. diff --git a/kde/patch/perlqt.patch b/kde/patch/perlqt.patch new file mode 100644 index 0000000..1cdd7db --- /dev/null +++ b/kde/patch/perlqt.patch @@ -0,0 +1,3 @@ +# Fix build: +cat $CWD/patch/perlqt/perlqt.gcc6.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/perlqt/perlqt.gcc6.diff b/kde/patch/perlqt/perlqt.gcc6.diff new file mode 100644 index 0000000..9a6e42e --- /dev/null +++ b/kde/patch/perlqt/perlqt.gcc6.diff @@ -0,0 +1,11 @@ +--- ./qtcore/src/util.cpp.orig 2014-11-04 16:59:39.000000000 -0600 ++++ ./qtcore/src/util.cpp 2017-10-04 22:25:36.055839800 -0500 +@@ -2251,7 +2251,7 @@ + methcache.insert(mcid, new Smoke::ModuleIndex(mi)); + } + +- static smokeperl_object nothis = { 0, 0, 0, false }; ++ static smokeperl_object nothis = { 0, 0, 0, NULL }; + smokeperl_object* call_this = 0; + if ( SvOK(sv_this) ) { + call_this = sv_obj_info( sv_this ); |