diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | get_qsci.sh.patch | 34 | ||||
| -rw-r--r-- | qscite.pro.patch | 10 |
4 files changed, 45 insertions, 17 deletions
@@ -1,3 +1,5 @@ +# Generated by mksrcinfo v8 +# Mon May 15 09:52:04 UTC 2017 pkgbase = qscite pkgdesc = A code editor written in C++ and Qt4; A clone of SciTE pkgver = 0.5_svn211 @@ -7,12 +9,12 @@ pkgbase = qscite arch = x86_64 license = GPL depends = qt4 - source = http://qscite.googlecode.com/files/qscite-r211.tar.gz + source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/qscite/qscite-r211.tar.gz source = get_qsci.sh.patch source = qscite.pro.patch md5sums = 2ce7a915e5560725d897816688a4bef7 - md5sums = 0bb49a6179912d6d0b674c5623a45a34 - md5sums = c13cc624b2ed1ce7a980afbb2d2bbc15 + md5sums = 4720cc18cf7140b57b0aa4fb40cc6ee3 + md5sums = 9dc1e5684571e8a30c71f2752a511dc3 pkgname = qscite @@ -9,20 +9,20 @@ arch=('i686' 'x86_64') url="http://qscite.googlecode.com/" license=('GPL') depends=('qt4') -source=(http://qscite.googlecode.com/files/${pkgname}-r${_pkgrev}.tar.gz +source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pkgname}/${pkgname}-r${_pkgrev}.tar.gz" get_qsci.sh.patch qscite.pro.patch) md5sums=('2ce7a915e5560725d897816688a4bef7' - '0bb49a6179912d6d0b674c5623a45a34' - 'c13cc624b2ed1ce7a980afbb2d2bbc15') + '4720cc18cf7140b57b0aa4fb40cc6ee3' + '9dc1e5684571e8a30c71f2752a511dc3') prepare() { cd "${srcdir}/${pkgname}" # fix scintilla2 download path - patch -p0 < "${srcdir}/get_qsci.sh.patch" + patch -p1 -i "${srcdir}/get_qsci.sh.patch" # add install section and fix filepath - patch -p0 < "${srcdir}/qscite.pro.patch" + patch -p1 -i "${srcdir}/qscite.pro.patch" # fix version sed -i "s#0.5-svn190#${pkgver//_/-}#" qscite.desktop } diff --git a/get_qsci.sh.patch b/get_qsci.sh.patch index 0104f79b491a..1c10eef57c69 100644 --- a/get_qsci.sh.patch +++ b/get_qsci.sh.patch @@ -1,11 +1,35 @@ ---- get_qsci.sh.old 2011-03-22 15:20:40.000000000 +0300 -+++ get_qsci.sh 2013-09-17 01:46:11.755695009 +0400 -@@ -6,7 +6,7 @@ +diff -ruN qscite-orig/get_qsci.sh qscite/get_qsci.sh +--- qscite-orig/get_qsci.sh 2017-05-15 12:25:23.375996790 +0300 ++++ qscite/get_qsci.sh 2017-05-15 12:29:36.973168032 +0300 +@@ -6,8 +6,8 @@ /snapshot/ {next} /tar\.gz/ { print $2 } ' ) -_download_link="http://www.riverbankcomputing.co.uk$_download_path" -+_download_link=`echo $_download_path | sed "s#http://#http://optimate.dl.#" | sed "s#projects/pyqt/files#project/pyqt#"` - _archive_filename=$( basename "$_download_path" ) +-_archive_filename=$( basename "$_download_path" ) ++_download_link="https://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-2.10/QScintilla_gpl-2.10.tar.gz" ++_archive_filename=$( basename "$_download_link" ) _archive_dir=$( echo "$_archive_filename" | sed 's/.tar.gz//' ) _archive_size=$( + curl -sI "$_download_link" 2>/dev/null | awk ' +@@ -18,17 +18,17 @@ + + if [ -f "$_archive_filename" ]; then + _local_size=$( ls -l "$_archive_filename" | awk '{ print $5 }' ) +- ++ + if [ "$_local_size" != "$_archive_size" ]; then + rm -f "$_archive_filename" + echo "Downloading QScintilla2..." +- curl "$_download_link" -o "$_archive_filename" ++ wget "$_download_link" + else + echo "QScintilla2 already downloaded." > /dev/stderr + fi + else + echo "Downloading QScintilla2..." +- curl "$_download_link" -o "$_archive_filename" ++ wget "$_download_link" + fi + + if [ -d "$_archive_dir" ]; then diff --git a/qscite.pro.patch b/qscite.pro.patch index 10d62e04401f..21cb3b8c3fb3 100644 --- a/qscite.pro.patch +++ b/qscite.pro.patch @@ -1,5 +1,6 @@ ---- qscite.pro.old 2011-03-22 15:20:40.000000000 +0300 -+++ qscite.pro 2013-09-17 02:36:51.998947959 +0400 +diff -ruN qscite-orig/qscite.pro qscite/qscite.pro +--- qscite-orig/qscite.pro 2017-05-15 12:41:47.254988860 +0300 ++++ qscite/qscite.pro 2017-05-15 12:43:45.165172448 +0300 @@ -13,14 +13,14 @@ }
@@ -14,7 +15,7 @@ qsci_lib.commands += $(QMAKE) -after \"CONFIG += static\" qscintilla.pro &&
qsci_lib.commands += $(MAKE) &&
- qsci_lib.commands += cd ../.. && cp QScintilla2/Qt4/libqscintilla2.a $(OBJECTS_DIR)
-+ qsci_lib.commands += cd ../.. && cp QScintilla2/Qt4Qt5/libqscintilla2.a $(OBJECTS_DIR)
++ qsci_lib.commands += cd ../.. && cp QScintilla2/Qt4Qt5/libqscintilla2_qt4.a $(OBJECTS_DIR)
qsci_lib.depends = qsci_project
QMAKE_EXTRA_TARGETS += qsci_project qsci_lib
@@ -23,8 +24,9 @@ HEADERS += qterminal_pty.h
SOURCES += qterminal_pty.cpp
- INCLUDEPATH += QScintilla2/Qt4
+- LIBS += build/libqscintilla2.a
+ INCLUDEPATH += QScintilla2/Qt4Qt5
- LIBS += build/libqscintilla2.a
++ LIBS += build/libqscintilla2_qt4.a
!macx {
LIBS += -lutil
DEFINES += QSCITE_MONO_FAMILY='\\"Monospace\\"'
|