[SM-Commit] GIT changes to master grimoire by Julien ROZO (174aa9ea4b89b9ba851bbc408a67e2178d8ce001)

Julien ROZO scm at sourcemage.org
Sun Dec 23 08:52:30 EST 2007


GIT changes to master grimoire by Julien ROZO <julien at rozo.org>:

 kde-look/FUNCTIONS               |    8 ++++++++
 kde-look/gtk-qt-engine/BUILD     |    4 ++++
 kde-look/gtk-qt-engine/DEPENDS   |   25 ++++++++++++++++++-------
 kde-look/gtk-qt-engine/DETAILS   |    8 ++++----
 kde-look/gtk-qt-engine/HISTORY   |    7 +++++++
 kde-look/gtk-qt-engine/PRE_BUILD |    4 ----
 kde-look/kdmtheme/DEPENDS        |    3 ++-
 kde-look/kdmtheme/DETAILS        |    4 ++--
 kde-look/kdmtheme/HISTORY        |    4 ++++
 9 files changed, 49 insertions(+), 18 deletions(-)

New commits:
commit ba18c3b27349ddedb2105531a74268d50e39d459
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    gtk-qt-engine: updated version to 0.8; fixed WEB_SITE; spell now uses cmake;
    added libbonoboui and kdesdk as optional deps; removed KDE_DEPENDS,
    as gtk-qt-engine doesn't need arts; removed PRE_BUILD

commit ae153135eacb12a1499467a13a9485c5ac6f9451
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kdmtheme:  updated version to 1.2.2, added automake-1.7 as a dependency

commit 9c623cb3ea251d44c256d888a8be5dba8a7e0b43
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    kde-look section: added FUNCTIONS script from kde-apps section, adjusting to the new kde3 build process

diff --git a/kde-look/FUNCTIONS b/kde-look/FUNCTIONS
new file mode 100755
index 0000000..2a2dd1f
--- /dev/null
+++ b/kde-look/FUNCTIONS
@@ -0,0 +1,8 @@
+# we need a different --includedir value for KDE3 spells,
+# so as to avoid conflicts with KDE4
+
+function default_build() {
+  default_kde3_build
+}
+
+
diff --git a/kde-look/gtk-qt-engine/BUILD b/kde-look/gtk-qt-engine/BUILD
new file mode 100755
index 0000000..97584ef
--- /dev/null
+++ b/kde-look/gtk-qt-engine/BUILD
@@ -0,0 +1,4 @@
+OPTS="-DKDE3_INCLUDE_DIR=$INSTALL_ROOT/usr/include/kde3 $OPTS" &&
+cd $SOURCE_DIRECTORY  &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr .  $OPTS  &&
+make
diff --git a/kde-look/gtk-qt-engine/DEPENDS b/kde-look/gtk-qt-engine/DEPENDS
index 93bcb16..de58ba4 100755
--- a/kde-look/gtk-qt-engine/DEPENDS
+++ b/kde-look/gtk-qt-engine/DEPENDS
@@ -1,12 +1,23 @@
-depends  g++    &&
-depends  gtk+2  &&
-depends  glib2  &&
-depends  pango  &&
-
-.  "$SECTION_DIRECTORY/KDE_DEPENDS"  &&
+depends  g++      &&
+depends  gtk+2    &&
+depends  glib2    &&
+depends  pango    &&
+depends  qt-x11   &&
+depends  kdelibs  &&
+depends  cmake    &&
 
 .  "$GRIMOIRE/FUNCTIONS"  &&
 if  check_if_xorg_modular_libs  qt-x11
 then
   depends  libx11
-fi
+fi  &&
+
+optional_depends  libbonoboui  \
+                  ""           \
+                  ""           \
+                  "to apply QT theme in libbonoboui based theme"  &&
+
+optional_depends  kdesdk  \
+                  ""      \
+                  ""      \
+                  "to translate configuration panel"
diff --git a/kde-look/gtk-qt-engine/DETAILS b/kde-look/gtk-qt-engine/DETAILS
index a0a7c9a..9c1c737 100755
--- a/kde-look/gtk-qt-engine/DETAILS
+++ b/kde-look/gtk-qt-engine/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gtk-qt-engine
-         VERSION=0.7
+         VERSION=0.8
           SOURCE=$SPELL-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://www.freedesktop.org/~davidsansome/$SOURCE
-     SOURCE_HASH=sha512:5a7db1ebff48a690489a14a90b33cb61c555c06d5da43eb5d448e5e12b0dc76bf49f3227f4f6ed9b65545f6ac67226050aac6dd61da826e137439889cbd739c3
+   SOURCE_URL[0]=http://gtk-qt.ecs.soton.ac.uk/files/$VERSION/$SOURCE
+     SOURCE_HASH=sha512:f9014ca60c3374ea1abda8f006678b0d9aa6c5dcec3dfe2e16fb3f42ad30f953ec4ec8dfe4885e34d034f73913e7f090a24d86cefffd13954f290a050d98d835
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-        WEB_SITE=http://www.freedesktop.org/wiki/Software_2fgtk_2dqt
+        WEB_SITE=http://gtk-qt.ecs.soton.ac.uk/
          ENTERED=20060706
         KEYWORDS="kde"
       LICENSE[0]=GPL
diff --git a/kde-look/gtk-qt-engine/HISTORY b/kde-look/gtk-qt-engine/HISTORY
index c285d84..26caf3c 100644
--- a/kde-look/gtk-qt-engine/HISTORY
+++ b/kde-look/gtk-qt-engine/HISTORY
@@ -1,3 +1,10 @@
+2007-12-22 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 0.8, fixed WEB_SITE
+	* BUILD: spell now uses cmake
+	* DEPENDS: added cmake, added libbonoboui and kdesdk as optional deps;
+	  removed KDE_DEPENDS, as gtk-qt-engine doesn't need arts
+	* PRE_BUILD: removed
+
 2007-02-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* CONFLICTS: removed, deprecation complete
 
diff --git a/kde-look/gtk-qt-engine/PRE_BUILD b/kde-look/gtk-qt-engine/PRE_BUILD
deleted file mode 100755
index f425511..0000000
--- a/kde-look/gtk-qt-engine/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build  &&
-
-# Prevent duplicate install of Control Center menu item.
-sedit  's/kcmgtk-xdg.desktop//'  $SOURCE_DIRECTORY/kcm_gtk/Makefile.in
diff --git a/kde-look/kdmtheme/DEPENDS b/kde-look/kdmtheme/DEPENDS
index 561b170..874e079 100755
--- a/kde-look/kdmtheme/DEPENDS
+++ b/kde-look/kdmtheme/DEPENDS
@@ -1 +1,2 @@
-.  "$SECTION_DIRECTORY/KDE_DEPENDS"
+.  "$SECTION_DIRECTORY/KDE_DEPENDS"  &&
+depends  automake-1.7
diff --git a/kde-look/kdmtheme/DETAILS b/kde-look/kdmtheme/DETAILS
index eb1e552..77bf7cf 100755
--- a/kde-look/kdmtheme/DETAILS
+++ b/kde-look/kdmtheme/DETAILS
@@ -1,8 +1,8 @@
            SPELL=kdmtheme
-         VERSION=1.1.2
+         VERSION=1.2.2
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_URL=http://beta.smileaf.org/files/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:78716acafe9e7f785027eeff99c0de09730493a40914927df0c0ea5c8ba7460aacf687cc7fe88c188eef465108e61b657b0192f2135b940483fce53093f0f19f
+     SOURCE_HASH=sha512:52c3005a9221eda12a4a6e11f6c3e6cfa90f6d7d9f4bd52f4ce048a2b669656fb4cb6d456359c8277a247b9145c216503c82e54e39ef88d826029bf2d8e30a88
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://kde-apps.org/content/show.php?content=22120
          ENTERED=20060131
diff --git a/kde-look/kdmtheme/HISTORY b/kde-look/kdmtheme/HISTORY
index ad7c295..76b7386 100644
--- a/kde-look/kdmtheme/HISTORY
+++ b/kde-look/kdmtheme/HISTORY
@@ -1,3 +1,7 @@
+2007-12-23 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 1.2.2
+	* DEPENDS: added automake-1.7
+
 2006-10-26 Juuso Alasuutari <iuso at sourcemage.org>
 	* DEPENDS: Removed depends kdelibs (is in KDE_DEPENDS).
 



More information about the SM-Commit mailing list