Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3222cdcf35f54fca44abf324868d70169b6b8fd9
commit 3222cdcf35f54fca44abf324868d70169b6b8fd9 Author: crazy <[email protected]> Date: Sat Mar 18 12:25:54 2017 +0100 qscintilla2-qt5-2.10-1-x86_64 * Version bump diff --git a/source/xlib-extra/qscintilla2-qt5/FrugalBuild b/source/xlib-extra/qscintilla2-qt5/FrugalBuild index e5db4bf..3b79819 100644 --- a/source/xlib-extra/qscintilla2-qt5/FrugalBuild +++ b/source/xlib-extra/qscintilla2-qt5/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Melko <[email protected]> pkgname=qscintilla2-qt5 -pkgver=2.9.4 +pkgver=2.10 origname=QScintilla pkgrel=1 pkgdesc="QScintilla2 is a port to Qt of Neil Hodgson's Scintilla C++ editor class. (Qt5)" @@ -12,13 +12,11 @@ _F_sourceforge_name="QScintilla_gpl" _F_sourceforge_dirname="pyqt" Finclude sourceforge up2date="lynx -dump http://www.riverbankcomputing.co.uk/software/qscintilla/download | grep -m1 'QScintilla_gpl-\(.*\).tar.gz' | sed 's/.*gpl-\(.*\).tar.gz.*/\1/'" -source+=(libname.patch) groups=('xlib-extra') archs=('x86_64') depends=('qt5-base>=5.7.1' 'qt5-tools>=5.7.1') makedepends+=('x11-protos') -sha1sums=('0aea19d76a291b1bc7ecff26d18d1ae619d5bf05' \ - '8806599a7130d96778504aab293e34e20b1e4b7a') +sha1sums=('922d1cb4378738fa5ecfc4c248fe19a5bb28b27b') _F_cd_path="QScintilla_gpl-${pkgver}" replaces=("qscintilla2-qt4") @@ -27,6 +25,7 @@ conflicts=("qscintilla2-qt4") build() { + Fcd QScintilla_gpl-$pkgver Fpatchall Fexec cd Qt4Qt5 || Fdie Fexec qmake-qt5 QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" qscintilla.pro || Fdie diff --git a/source/xlib-extra/qscintilla2-qt5/libname.patch b/source/xlib-extra/qscintilla2-qt5/libname.patch deleted file mode 100644 index 617f402..0000000 --- a/source/xlib-extra/qscintilla2-qt5/libname.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf 2015-04-20 17:38:24.000000000 +0300 -+++ QScintilla-gpl-2.9.new/Qt4Qt5/features/qscintilla2.prf 2015-05-23 17:17:50.000000000 +0300 -@@ -17,9 +17,18 @@ - win32: { - LIBS += -lqscintilla2d - } else { -- LIBS += -lqscintilla2 -+ greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBS += -lqt5scintilla2 -+ } else { -+ LIBS += -lqscintilla2 -+ } - } - } - } else { -+ greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBS += -lqt5scintilla2 -+ } -+ else { - LIBS += -lqscintilla2 -+ } - } ---- QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro 2015-04-20 17:38:24.000000000 +0300 -+++ QScintilla-gpl-2.9.new/Qt4Qt5/qscintilla.pro 2015-05-23 17:17:50.000000000 +0300 -@@ -36,6 +36,7 @@ - - greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets printsupport -+ TARGET = qt5scintilla2 - - greaterThan(QT_MINOR_VERSION, 1) { - macx:QT += macextras ---- QScintilla-gpl-2.9/designer-Qt4Qt5/designer.pro 2015-03-26 20:10:15.000000000 +0200 -+++ QScintilla-gpl-2.9.new/designer-Qt4Qt5/designer.pro 2015-05-23 17:17:50.000000000 +0300 -@@ -8,11 +8,14 @@ - - greaterThan(QT_MAJOR_VERSION, 4) { - QT += designer -+ TARGET = qt5scintillaplugin -+ LIBS += -lqt5scintilla2 - - # Work around QTBUG-39300. - CONFIG -= android_install - } else { - CONFIG += designer -+ LIBS += -lqscintilla2 - } - - macx { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
