summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2011-03-31 21:20:20 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-03-31 23:51:43 -0500
commit98663e11303e8ec14a1b4a8ba37110d3749e9814 (patch)
treeb634a161a15af3249d978196bb4b72ad227d320a
parent2f5d00ad173f92d29d195e5df2c0b0e8a8d43be9 (diff)
downloadslackbuilds-98663e11303e8ec14a1b4a8ba37110d3749e9814.tar.gz
development/sqlitebrowser: Patched to fix building with Qt 4.7.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch31
-rw-r--r--development/sqlitebrowser/sqlitebrowser.SlackBuild5
2 files changed, 35 insertions, 1 deletions
diff --git a/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch b/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
new file mode 100644
index 0000000000..ff6af92372
--- /dev/null
+++ b/development/sqlitebrowser/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
@@ -0,0 +1,31 @@
+As suggested by Andreas Gölzer at http://sourceforge.net/tracker/index.php?func=detail&aid=3096050&group_id=87946&atid=584909
+
+--- sqlitebrowser/sqlitedb.h
++++ sqlitebrowser/sqlitedb.h
+@@ -41,7 +41,7 @@
+ class DBBrowserField
+ {
+ public:
+- DBBrowserField() : name( 0 ) { }
++ DBBrowserField() : name( "0" ) { }
+ DBBrowserField( const QString& wname,const QString& wtype )
+ : name( wname), type( wtype )
+ { }
+@@ -55,7 +55,7 @@
+ class DBBrowserIndex
+ {
+ public:
+- DBBrowserIndex() : name( 0 ) { }
++ DBBrowserIndex() : name( "0" ) { }
+ DBBrowserIndex( const QString& wname,const QString& wsql )
+ : name( wname), sql( wsql )
+ { }
+@@ -70,7 +70,7 @@
+ class DBBrowserTable
+ {
+ public:
+- DBBrowserTable() : name( 0 ) { }
++ DBBrowserTable() : name( "0" ) { }
+ DBBrowserTable( const QString& wname,const QString& wsql )
+ : name( wname), sql( wsql )
+ { }
diff --git a/development/sqlitebrowser/sqlitebrowser.SlackBuild b/development/sqlitebrowser/sqlitebrowser.SlackBuild
index e5fc9d0e3b..bb30105a15 100644
--- a/development/sqlitebrowser/sqlitebrowser.SlackBuild
+++ b/development/sqlitebrowser/sqlitebrowser.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=sqlitebrowser
VERSION=${VERSION:-2.0b1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -55,6 +55,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix building with Qt 4.7
+patch -p0 < $CWD/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
+
qmake
make
mkdir -p $PKG/usr/bin