Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Chakra
Packages
core
Commits
f8674242
Commit
f8674242
authored
Nov 13, 2014
by
Xuetian Weng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix qscintilla
parent
5f9d954b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
35 deletions
+20
-35
.gitignore
.gitignore
+14
-10
qscintilla/PKGBUILD
qscintilla/PKGBUILD
+6
-9
qscintilla/qsci_link.patch
qscintilla/qsci_link.patch
+0
-16
No files found.
.gitignore
View file @
f8674242
...
...
@@ -7,12 +7,17 @@ src
dbg
hdr
*~
build-desktop.sh
build.sh
check-database.sh
check-links.sh
check-so-files.sh
clean-builddir.sh
clean-workdir.sh
clean-database.sh
c
opy
.sh
c
lean-workdir
.sh
copy-any.sh
fakeuname
get-any.sh
makepkg
move.sh
...
...
@@ -21,19 +26,18 @@ pkgrels-increase.sh
pkgrels-reset.sh
rebuildlist-build.sh
rebuildlist-generate.sh
recreate-database.sh
remove.sh
repoclean-local.sh
repoclean-remote.sh
show-config.sh
show-pkglists.sh
sync-complete.sh
sync-down.sh
sync-up-nodb.sh
sync-up.sh
remove.sh
recreate-database.sh
upload.sh
upload-nodb.sh
sign-remote-db.sh
sign-remote-pkg.sh
unlock-database.sh
upload-nodb.sh
upload.sh
*-cfg.conf
*-makepkg.conf
...
...
qscintilla/PKGBUILD
View file @
f8674242
...
...
@@ -7,22 +7,19 @@ pkgname=('qscintilla'
'qscintilla-python3'
'qscintilla-python-common'
)
pkgver
=
2.8.3
pkgrel
=
2
pkgrel
=
3
license
=(
'GPL'
)
arch
=(
'x86_64'
)
url
=
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
makedepends
=(
"python2-pyqt4"
"python3-pyqt4"
"chrpath"
"python2-sip"
"python3-sip"
)
source
=(
"http://downloads.sourceforge.net/pyqt/QScintilla-gpl-
${
pkgver
}
.tar.gz"
'configure.py-objdir-support.diff'
'qsci_link.patch'
)
'configure.py-objdir-support.diff'
)
md5sums
=(
'bbf6944a9d3b089a79763ca4e6486b9d'
'e304f8cd5e3e7ded61eda15bf56613a8'
'3bb99cf0ebbf9bea6a1d0f9067dc7124'
)
'e304f8cd5e3e7ded61eda15bf56613a8'
)
prepare
()
{
cd
QScintilla-gpl-
${
pkgver
}
patch
-p1
-i
"
${
srcdir
}
"
/configure.py-objdir-support.diff
patch
-p1
-i
"
${
srcdir
}
"
/qsci_link.patch
}
build
()
{
...
...
@@ -33,17 +30,17 @@ build() {
make
cd
../designer-Qt4Qt5
qmake designer.pro INCLUDEPATH+
=
../Qt4Qt5 QMAKE_LIBDIR+
=
../Qt4Qt5
QMAKEFEATURES
=
../Qt4Qt5/features
qmake designer.pro INCLUDEPATH+
=
../Qt4Qt5 QMAKE_LIBDIR+
=
../Qt4Qt5
make
cp
-r
../Python ../Python3
cd
../Python
python2 configure.py
-n
../Qt4Qt5/
-o
../Qt4Qt5
-c
--qmake
/usr/bin/qmake
QMAKEFEATURES
=
../Qt4Qt5/features
python2 configure.py
-n
../Qt4Qt5/
-o
../Qt4Qt5
-c
--qmake
/usr/bin/qmake
make
cd
../Python3
python3 configure.py
-n
../Qt4Qt5/
-o
../Qt4Qt5/
-c
--qmake
/usr/bin/qmake
QMAKEFEATURES
=
../Qt4Qt5/features
python3 configure.py
-n
../Qt4Qt5/
-o
../Qt4Qt5/
-c
--qmake
/usr/bin/qmake
make
}
...
...
qscintilla/qsci_link.patch
deleted
100644 → 0
View file @
5f9d954b
Index: qscintilla2-2.8.3+dfsg/Python/configure.py
===================================================================
--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py 2014-07-05 10:05:48.614827688 -0400
+++ qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:05:48.610827688 -0400
@@ -1434,7 +1434,10 @@
libs = qmake_config.get('LIBS')
if libs:
- pro.write('LIBS += %s\n' % libs)
+ if target_config.pyqt_package == 'PyQt5':
+ pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
+ else:
+ pro.write('LIBS += %s -lqscintilla2\n' % libs)
if not opts.static:
pro.write('''
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment