[Lunar-commits] <moonbase> qt4: moved it from kde4/base to the qt4-apps. it better fits there.

Florin Braescu florin at lunar-linux.org
Tue Jan 5 20:39:58 CET 2010


commit 1c296b45ccda665bb76905f9fe004bec00200602
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Tue Jan 5 21:39:58 2010 +0200

    qt4: moved it from kde4/base to the qt4-apps. it better fits there.
---
 kde4/base/qt4/BUILD        |   48 --------------------------------------------
 kde4/base/qt4/CONFIGURE    |    5 ----
 kde4/base/qt4/DEPENDS      |   40 ------------------------------------
 kde4/base/qt4/DETAILS      |   28 -------------------------
 kde4/base/qt4/POST_INSTALL |    4 ---
 kde4/base/qt4/POST_REMOVE  |    1 -
 qt4-apps/qt4/BUILD         |   48 ++++++++++++++++++++++++++++++++++++++++++++
 qt4-apps/qt4/CONFIGURE     |    5 ++++
 qt4-apps/qt4/DEPENDS       |   40 ++++++++++++++++++++++++++++++++++++
 qt4-apps/qt4/DETAILS       |   28 +++++++++++++++++++++++++
 qt4-apps/qt4/POST_INSTALL  |    4 +++
 qt4-apps/qt4/POST_REMOVE   |    1 +
 12 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
deleted file mode 100644
index c616cfd..0000000
--- a/kde4/base/qt4/BUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-(
-
-  export QTDIR=$SOURCE_DIRECTORY
-  export PATH=$QTDIR/bin:$PATH
-  export LD_LIBRARY_PATH=$QTDIR/lib
-
-  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
-  sedit "s/-O2/$CFLAGS/" mkspecs/common/g++.conf &&
-
-  if module_installed phonon ; then
-    OPTS+=" -phonon -phonon-backend"
-   else
-    OPTS+=" -no-phonon -phonon-backend"
-  fi &&
-
-  if [ "$MAKE_DOCS" == "y" ]; then
-    OPTS+=" -make tools -make docs -make translations"
-  fi &&
-
-  if [ "$MAKE_EXAMPLE_DEMOS" == "y" ]; then
-    OPTS+=" -make examples -make demos -make tools -make docs -make translations"
-  fi &&
-
-  OPTS+=" -release -fast -no-separate-debug-info -script -scripttools -accessibility -pch -glib" &&
-
-  echo "yes" | ./configure               \
-               -prefix ${MODULE_PREFIX}  \
-               $OPTS                    &&
-
-  default_make  &&
-
-  if [ "$MAKE_QDOC3" == "y" ]; then
-     cd tools/qdoc3 &&
-     qmake -unix -o Makefile qdoc3.pro &&
-     make    &&
-     install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
-     cd $SOURCE_DIRECTORY
-  fi &&
-
-  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc  &&
-  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc  &&
-  echo export XDG_DATA_DIRS=\"/usr/share:'${QTDIR}'/share\" >> $SOURCE_DIRECTORY/qt4.rc &&
-  echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\"  \
-        >> $SOURCE_DIRECTORY/qt4.rc  &&
-
-  install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/
-
-) > $C_FIFO 2>&1
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
deleted file mode 100644
index ceb87e8..0000000
--- a/kde4/base/qt4/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
-mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
-mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
-mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
-mquery MAKE_WEBKIT "Build the webkit plugin?" y "-webkit" "-no-webkit"
diff --git a/kde4/base/qt4/DEPENDS b/kde4/base/qt4/DEPENDS
deleted file mode 100644
index 0898b4c..0000000
--- a/kde4/base/qt4/DEPENDS
+++ /dev/null
@@ -1,40 +0,0 @@
-depends  %X
-
-optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
-optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
-optional_depends  "libpng"     "-system-libpng"    "-qt-libpng"     "Use system or Qt verion of PNG"
-optional_depends  "zlib"       "-system-zlib"      "-qt-zlib"       "Choose system or Qt version of zlib"
-optional_depends  "libungif"   "-qt-gif"           "-no-gif"        "for GIF reading support"
-optional_depends  "fontconfig" "-fontconfig"       "-no-fontconfig" "for anti alias font support"
-optional_depends  "cups"       "-cups"             "-no-cups"       "for printing support, needed by kdelibs4"
-optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
-
-optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support"
-
-
-
-optional_depends  "mysql"                                                    \
-                  "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
-                  "-no-sql-mysql"                                            \
-                  "for mysql database support"
-
-optional_depends  "sqlite"                                                   \
-                  "-plugin-sql-sqlite -I/usr/include -L/usr/lib"             \
-                  "-no-sql-sqlite"                                           \
-                  "for sqlite database support"
-
-optional_depends  "postgresql"                                               \
-                  "-plugin-sql-psql -I/usr/include/postgresql/server         \
-                  -L/usr/lib/postgresql"                                     \
-                  "-no-sql-psql"                                             \
-                  "for postgresql database support"
-
-optional_depends  "unixODBC"                                                 \
-                  "-plugin-sql-odbc"                                         \
-                  "-no-sql-odbc"                                             \
-                  "for unixODBC support"
-
-optional_depends  "freetds"                                                  \
-                  "-plugin-sql-tds"                                          \
-                  "-no-sql-tds"                                              \
-                  "for tabular data stream support"                          \
diff --git a/kde4/base/qt4/DETAILS b/kde4/base/qt4/DETAILS
deleted file mode 100644
index fc34aa1..0000000
--- a/kde4/base/qt4/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-          MODULE=qt4
-         VERSION=4.6.0
-          SOURCE=qt-everywhere-opensource-src-${VERSION}.tar.gz
-   SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source
-   SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
-      SOURCE_VFY=c2cbbde83f1ebac3b8dd13a112fcad757d395041
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
-        WEB_SITE=http://www.trolltech.com/qt
-         ENTERED=20020420
-         UPDATED=20091202
-#         GARBAGE=off
-     FTP_PASSIVE=on
-      MAINTAINER=florin at lunar-linux.org
-           SHORT="A C++ toolkit for application development"
-
-cat << EOF
-Qt is a C++ toolkit for application development. It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform
-functionality: GUI, database access, networking, file handling, etc. The
-Qt library encapsulates the different APIs of different operating systems,
-providing the application programmer with a single, common API for all
-operating systems. The native C APIs are encapsulated in a set of
-well-designed, fully object-oriented C++ classes.
-EOF
diff --git a/kde4/base/qt4/POST_INSTALL b/kde4/base/qt4/POST_INSTALL
deleted file mode 100644
index af7af03..0000000
--- a/kde4/base/qt4/POST_INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-ld_add $MODULE_PREFIX/lib
-
-# if module_installed sip;   then lin sip;   fi
-# if module_installed PyQt-4;  then lin PyQt-4;  fi
diff --git a/kde4/base/qt4/POST_REMOVE b/kde4/base/qt4/POST_REMOVE
deleted file mode 100644
index a51e5a0..0000000
--- a/kde4/base/qt4/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-ld_remove $MODULE_PREFIX/lib
diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
new file mode 100644
index 0000000..c616cfd
--- /dev/null
+++ b/qt4-apps/qt4/BUILD
@@ -0,0 +1,48 @@
+(
+
+  export QTDIR=$SOURCE_DIRECTORY
+  export PATH=$QTDIR/bin:$PATH
+  export LD_LIBRARY_PATH=$QTDIR/lib
+
+  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
+  sedit "s/-O2/$CFLAGS/" mkspecs/common/g++.conf &&
+
+  if module_installed phonon ; then
+    OPTS+=" -phonon -phonon-backend"
+   else
+    OPTS+=" -no-phonon -phonon-backend"
+  fi &&
+
+  if [ "$MAKE_DOCS" == "y" ]; then
+    OPTS+=" -make tools -make docs -make translations"
+  fi &&
+
+  if [ "$MAKE_EXAMPLE_DEMOS" == "y" ]; then
+    OPTS+=" -make examples -make demos -make tools -make docs -make translations"
+  fi &&
+
+  OPTS+=" -release -fast -no-separate-debug-info -script -scripttools -accessibility -pch -glib" &&
+
+  echo "yes" | ./configure               \
+               -prefix ${MODULE_PREFIX}  \
+               $OPTS                    &&
+
+  default_make  &&
+
+  if [ "$MAKE_QDOC3" == "y" ]; then
+     cd tools/qdoc3 &&
+     qmake -unix -o Makefile qdoc3.pro &&
+     make    &&
+     install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
+     cd $SOURCE_DIRECTORY
+  fi &&
+
+  echo "export QTDIR=\"${MODULE_PREFIX}\"" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo export PATH=\"'${QTDIR}'/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/qt4.rc  &&
+  echo export XDG_DATA_DIRS=\"/usr/share:'${QTDIR}'/share\" >> $SOURCE_DIRECTORY/qt4.rc &&
+  echo export PKG_CONFIG_PATH=\"'${QTDIR}'/lib/pkgconfig:'${PKG_CONFIG_PATH}'\"  \
+        >> $SOURCE_DIRECTORY/qt4.rc  &&
+
+  install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/
+
+) > $C_FIFO 2>&1
diff --git a/qt4-apps/qt4/CONFIGURE b/qt4-apps/qt4/CONFIGURE
new file mode 100644
index 0000000..ceb87e8
--- /dev/null
+++ b/qt4-apps/qt4/CONFIGURE
@@ -0,0 +1,5 @@
+mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
+mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
+mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
+mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
+mquery MAKE_WEBKIT "Build the webkit plugin?" y "-webkit" "-no-webkit"
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
new file mode 100644
index 0000000..0898b4c
--- /dev/null
+++ b/qt4-apps/qt4/DEPENDS
@@ -0,0 +1,40 @@
+depends  %X
+
+optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
+optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
+optional_depends  "libpng"     "-system-libpng"    "-qt-libpng"     "Use system or Qt verion of PNG"
+optional_depends  "zlib"       "-system-zlib"      "-qt-zlib"       "Choose system or Qt version of zlib"
+optional_depends  "libungif"   "-qt-gif"           "-no-gif"        "for GIF reading support"
+optional_depends  "fontconfig" "-fontconfig"       "-no-fontconfig" "for anti alias font support"
+optional_depends  "cups"       "-cups"             "-no-cups"       "for printing support, needed by kdelibs4"
+optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
+
+optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support"
+
+
+
+optional_depends  "mysql"                                                    \
+                  "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
+                  "-no-sql-mysql"                                            \
+                  "for mysql database support"
+
+optional_depends  "sqlite"                                                   \
+                  "-plugin-sql-sqlite -I/usr/include -L/usr/lib"             \
+                  "-no-sql-sqlite"                                           \
+                  "for sqlite database support"
+
+optional_depends  "postgresql"                                               \
+                  "-plugin-sql-psql -I/usr/include/postgresql/server         \
+                  -L/usr/lib/postgresql"                                     \
+                  "-no-sql-psql"                                             \
+                  "for postgresql database support"
+
+optional_depends  "unixODBC"                                                 \
+                  "-plugin-sql-odbc"                                         \
+                  "-no-sql-odbc"                                             \
+                  "for unixODBC support"
+
+optional_depends  "freetds"                                                  \
+                  "-plugin-sql-tds"                                          \
+                  "-no-sql-tds"                                              \
+                  "for tabular data stream support"                          \
diff --git a/qt4-apps/qt4/DETAILS b/qt4-apps/qt4/DETAILS
new file mode 100644
index 0000000..fc34aa1
--- /dev/null
+++ b/qt4-apps/qt4/DETAILS
@@ -0,0 +1,28 @@
+          MODULE=qt4
+         VERSION=4.6.0
+          SOURCE=qt-everywhere-opensource-src-${VERSION}.tar.gz
+   SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source
+   SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
+      SOURCE_VFY=c2cbbde83f1ebac3b8dd13a112fcad757d395041
+   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+        WEB_SITE=http://www.trolltech.com/qt
+         ENTERED=20020420
+         UPDATED=20091202
+#         GARBAGE=off
+     FTP_PASSIVE=on
+      MAINTAINER=florin at lunar-linux.org
+           SHORT="A C++ toolkit for application development"
+
+cat << EOF
+Qt is a C++ toolkit for application development. It lets application
+developers target all major operating systems with a single application
+source code.
+
+Qt provides a platform-independent API to all central platform
+functionality: GUI, database access, networking, file handling, etc. The
+Qt library encapsulates the different APIs of different operating systems,
+providing the application programmer with a single, common API for all
+operating systems. The native C APIs are encapsulated in a set of
+well-designed, fully object-oriented C++ classes.
+EOF
diff --git a/qt4-apps/qt4/POST_INSTALL b/qt4-apps/qt4/POST_INSTALL
new file mode 100644
index 0000000..a51bce1
--- /dev/null
+++ b/qt4-apps/qt4/POST_INSTALL
@@ -0,0 +1,4 @@
+ld_add $MODULE_PREFIX/lib
+
+# if module_installed sip;   then lin sip;   fi
+# if module_installed PyQt4; then lin PyQt4; fi
diff --git a/qt4-apps/qt4/POST_REMOVE b/qt4-apps/qt4/POST_REMOVE
new file mode 100644
index 0000000..a51e5a0
--- /dev/null
+++ b/qt4-apps/qt4/POST_REMOVE
@@ -0,0 +1 @@
+ld_remove $MODULE_PREFIX/lib


More information about the Lunar-commits mailing list