Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cb210ecc9da3d53079a2999bc2005184c7ac852f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cb210ecc9da3d53079a2999bc2005184c7ac852f)
  • Date: Thu, 13 Aug 2009 02:36:25 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4/FUNCTIONS | 2 --
kde4/HISTORY | 4 ----
kde4/kdegraphics4/DETAILS | 2 ++
kde4/kdegraphics4/HISTORY | 4 ++++
kde4/kdegraphics4/INSTALL | 3 +++
kde4/kdepim4/DETAILS | 6 +++---
kde4/kdepim4/HISTORY | 3 +++
7 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit cb210ecc9da3d53079a2999bc2005184c7ac852f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdepim4: => 4.3.63svn1008367

commit 82716463dd350ac3e6ec4633cb2c801e78432d61
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdegraphics4 0 fix pkconfig issue

commit 4c0f6b95ad7353ad07d2934f286991a5c58df05e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

Revert "fix bug #15343"
caused more problems than it solved

This reverts commit 55d694b32924dd9bd8fd44f1738975ce4ee79695.

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 79fcd90..6f37961 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -32,8 +32,6 @@ default_install() {
ln -sf "$INSTALL_ROOT/$dir1" \
"$KDE4DIR/share"
fi &&
-# also use one pkconfig directory
- ln -sf $INSTALL_ROOT/usr/lib/pkgconfig $KDE4DIR/lib &&

cd "$SOURCE_DIRECTORY/build" &&
make install
diff --git a/kde4/HISTORY b/kde4/HISTORY
index 74f4d7a..8016f2d 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,7 +1,3 @@
-2009-08-12 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS: make symlink between /opt/kde4/lib/pkgconfig and
/usr/lib/pkgconfig
- fixes bug #15343
-
2009-03-22 Eric Sandall <sandalle AT sourcemage.org>
* KDE_DEPENDS: kdelibs4 requires qt4 built with WebKit:
CMake Error: The following variables are used in this project, but
they are set to NOTFOUND.
diff --git a/kde4/kdegraphics4/DETAILS b/kde4/kdegraphics4/DETAILS
index 97856ed..8dbffb6 100755
--- a/kde4/kdegraphics4/DETAILS
+++ b/kde4/kdegraphics4/DETAILS
@@ -4,9 +4,11 @@ persistent_read kdelibs4 KDE_VER KDE_VER
if [[ "${KDE_VER}" == "unstable" ]];then
VERSION=4.3.63svn1007208

SOURCE_HASH=sha512:46b5ac5e38bbf76a5b2170ff380abd5bdabc52fd7d28b0dc4a82b95bd105be8ce664d5a9ce159561449416c13e196061414a03281f4e5ccdd40fbc5b14d72793
+ PATCHLEVEL=1
else
VERSION=4.3.0

SOURCE_HASH=sha512:5380f62d7b1869e1bf15e92554cea11131d3e6a3b29d48bb7f0e127822e805a69d4519a8251b0878fc68a1b706fd6b0128da04a6752f8a2f28cf8f349caeab95
+ PATCHLEVEL=1
fi
SOURCE=$SPELLX-$VERSION.tar.bz2

SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION//svn???????}/src/$SOURCE
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index dc9766c..6b74f9f 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,7 @@
+2009-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: added, fix bug #15343
+ * DETAILS: PATCHLEVEL=1
+
2009-08-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.63svn1007208 (unstable)

diff --git a/kde4/kdegraphics4/INSTALL b/kde4/kdegraphics4/INSTALL
new file mode 100755
index 0000000..cbb04f1
--- /dev/null
+++ b/kde4/kdegraphics4/INSTALL
@@ -0,0 +1,3 @@
+# use one pkconfig directory
+ln -sf $INSTALL_ROOT/usr/lib/pkgconfig $KDE4DIR/lib &&
+default_install
diff --git a/kde4/kdepim4/DETAILS b/kde4/kdepim4/DETAILS
index f01378d..4cd6adf 100755
--- a/kde4/kdepim4/DETAILS
+++ b/kde4/kdepim4/DETAILS
@@ -2,14 +2,14 @@
SPELLX=${SPELL//4}
persistent_read kdelibs4 KDE_VER KDE_VER
if [[ "${KDE_VER}" == "unstable" ]];then
- VERSION=4.2.98
-
SOURCE_HASH=sha512:f2b96c69dd7879c6412cabf1e075d14aeb931eb98ac3888a7b0fa37fea6094f22678eff29802ea5123e72591163c7839a0dec602192c3cca020d0659fe884d02
+ VERSION=4.3.63svn1008367
+
SOURCE_HASH=sha512:2f91292b00db16136ae59436964dca86115801922e2d066055c65c579d1c0a64bce45e1af12973ef82e058440548b40439f46229dc0374039e779bda3bbe96f2
else
VERSION=4.3.0

SOURCE_HASH=sha512:59800f133e6324199b47e034bf4076fa316c96d3a5b0a40e17503c6987380a5b1a902742564f1ab47615a561f19f69d35268f77d326940b5da5b4539c7d5b8b6
fi
SOURCE=$SPELLX-$VERSION.tar.bz2
-
SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION//svn??????}/src/$SOURCE
+
SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VERSION//svn???????}/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.kde.org
ENTERED=20020912
diff --git a/kde4/kdepim4/HISTORY b/kde4/kdepim4/HISTORY
index 21dc1a3..cfe8900 100644
--- a/kde4/kdepim4/HISTORY
+++ b/kde4/kdepim4/HISTORY
@@ -1,3 +1,6 @@
+2009-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.3.63svn1008367 (unstable)
+
2009-08-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.0 (stable)
* DEPENDS: remove version dependent stuff




Archive powered by MHonArc 2.6.24.

Top of Page