Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (770a9357b0222eb08edb95fb836fb503d9ec8c60)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Bor Kraljič (770a9357b0222eb08edb95fb836fb503d9ec8c60)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (770a9357b0222eb08edb95fb836fb503d9ec8c60)
  • Date: Thu, 25 Nov 2010 04:03:14 -0600
GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

devel/falcon/BUILD | 2 +-
devel/falcon/DETAILS | 6 +++---
devel/falcon/HISTORY | 5 +++++
devel/falcon/INSTALL | 1 -
kde4-apps/digikam4/HISTORY | 3 +++
kde4-apps/digikam4/PRE_BUILD | 3 ---
kde4-apps/kipi-plugins4/HISTORY | 3 +++
kde4-apps/kipi-plugins4/PRE_BUILD | 3 ---
kde4-support/phonon/DETAILS | 4 ++--
kde4-support/phonon/HISTORY | 6 ++++++
kde4-support/phonon/INSTALL | 2 --
kde4-support/phonon/PRE_BUILD | 4 ++++
kde4/kdebindings4/HISTORY | 3 +++
kde4/kdebindings4/PRE_BUILD | 8 +++++---
kde4/kdegraphics4/HISTORY | 5 +++++
kde4/kdegraphics4/INSTALL | 4 ----
kde4/kdegraphics4/PRE_BUILD | 10 ++++++++++
17 files changed, 50 insertions(+), 22 deletions(-)

New commits:
commit 770a9357b0222eb08edb95fb836fb503d9ec8c60
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdegraphics4: added hack to install pc files in /usr/lib/pkgconfig

commit c88ab294acaff59b2d7a074c0bec935724beec1f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdebindings4: added hack to install pc files in /usr/lib/pkgconfig

commit e2da83e39e986ff60654602d9ae01a55fef40d38
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

phonon: added PRE_BUILD to edit the cmakelist.txt to install pc file in
/usr/lib/pkgconfig

commit fb3d573fa99733249c87eb6296c912969bbed601
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kipi-plugins4: removed PRE_BUILD, #15829 fixed at kdegraphics4

commit 58074345ff87f34f33e3dbf8b463ce979d8130ef
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

digikam4: removed PRE_BUILD, #15829 fixed at kdegraphics4

commit 16b3c16ab40882f411406cb0d32318b51a8cffc4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

falcon: updated spell to 0.9.6.6 (& .tar.gz -> .tgz)

commit 75e86c0143a62f05424ec383a6353ae2c539025f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

phonon: updated spell to 4.4.3

diff --git a/devel/falcon/BUILD b/devel/falcon/BUILD
index 410e3ae..e013b8d 100755
--- a/devel/falcon/BUILD
+++ b/devel/falcon/BUILD
@@ -1 +1 @@
-./build.sh -p $INSTALL_ROOT/usr -int
+cmake_build
diff --git a/devel/falcon/DETAILS b/devel/falcon/DETAILS
index dffbae7..ec58280 100755
--- a/devel/falcon/DETAILS
+++ b/devel/falcon/DETAILS
@@ -1,8 +1,8 @@
SPELL=falcon
SPELLX=Falcon
- VERSION=0.9.6.4
-
SOURCE_HASH=sha512:244fc0cc6811d9c918a1983d93e380982584016d84752b00d3adc17e46d7a7cbf9d20f09b7562316b1c9ea6eaaa91c1cb931f4469f7d510d9084f1daaca732a5
- SOURCE=$SPELLX-$VERSION.tar.gz
+ VERSION=0.9.6.6
+
SOURCE_HASH=sha512:9064b9c16ec74ebdfbae4c4ee267cb2488948c8a6781822cd16ba0de64e369d4604e58b24beb578f5c4b04c1e88930ad267acf113db8c6928902d93bb2c4c77b
+ SOURCE=$SPELLX-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION//-1}
WEB_SITE=http://www.falconpl.org/
SOURCE_URL[0]=$WEB_SITE/project_dl/_official_rel/$SOURCE
diff --git a/devel/falcon/HISTORY b/devel/falcon/HISTORY
index 81b6111..b3916b5 100644
--- a/devel/falcon/HISTORY
+++ b/devel/falcon/HISTORY
@@ -1,3 +1,8 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.9.6.6 (& .tar.gz -> .tgz)
+ * INSTALL: removed, no longer needed
+ * BUILD: use cmake_build
+
2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.6.4

diff --git a/devel/falcon/INSTALL b/devel/falcon/INSTALL
deleted file mode 100755
index 3f0495e..0000000
--- a/devel/falcon/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-./build.sh -i -int
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 54e6d94..afedbfa 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: removed, #15829 fixed at kdegraphics4
+
2010-11-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.0

diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
deleted file mode 100755
index c3b8461..0000000
--- a/kde4-apps/digikam4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-export PKG_CONFIG_PATH=/opt/kde4/lib/pkgconfig
-
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index a05f9ad..6565de2 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: removed, #15829 fixed at kdegraphics4
+
2010-11-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.0

diff --git a/kde4-apps/kipi-plugins4/PRE_BUILD
b/kde4-apps/kipi-plugins4/PRE_BUILD
deleted file mode 100755
index c3b8461..0000000
--- a/kde4-apps/kipi-plugins4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-export PKG_CONFIG_PATH=/opt/kde4/lib/pkgconfig
-
diff --git a/kde4-support/phonon/DETAILS b/kde4-support/phonon/DETAILS
index d41e990..96044e9 100755
--- a/kde4-support/phonon/DETAILS
+++ b/kde4-support/phonon/DETAILS
@@ -11,8 +11,8 @@ fi
SOURCE_URL[0]=git://gitorious.org/$SPELL/$SPELL.git:$SPELL-git
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
else
- VERSION=4.4.2
-
SOURCE_HASH=sha512:8b0e971f11820120cc70f78505a2e85c5b770772a5ee080bf82bf15473d4c048345e1f4a2516ae0d5b8e098cc99a70cd826528b26d9fcdb34577b1f5ffd7b440
+ VERSION=4.4.3
+
SOURCE_HASH=sha512:09288eb22a00b19f6068e72eb08dbaaa39a0311a931b7d86c8af17896b048b24a349bef100be94bca13603f933bf48393e2abce9e14127ed1392aabaf9f48252
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/stable/phonon/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//.0}
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index bd09797..300f18b 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,9 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.4.3
+ * PRE_BUILD: added, edit the cmakelist.txt to install pc file in
+ /usr/lib/pkgconfig
+ * INSTALL: removed, fixed the problem with pc files in PRE_BUILD
+
2010-09-18 Bor Kraljič <pyrobor AT ver.si>
* INSTALL: added, create link to pc file in /usr/lib/pkgconfig
* DEPENDS: depends on qt4 without phonon
diff --git a/kde4-support/phonon/INSTALL b/kde4-support/phonon/INSTALL
deleted file mode 100755
index 719a7cf..0000000
--- a/kde4-support/phonon/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-default_install &&
-ln -sf ${INSTALL_ROOT}/opt/kde4/lib/pkgconfig/phonon.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/
diff --git a/kde4-support/phonon/PRE_BUILD b/kde4-support/phonon/PRE_BUILD
new file mode 100755
index 0000000..41934ef
--- /dev/null
+++ b/kde4-support/phonon/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig/:" \
+ CMakeLists.txt
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index 3bd5b93..0b5e0ef 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,3 +1,6 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, hack to install pc files in /usr/lib/pkgconfig
+
2010-11-03 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.3

diff --git a/kde4/kdebindings4/PRE_BUILD b/kde4/kdebindings4/PRE_BUILD
index 7b45833..948627a 100755
--- a/kde4/kdebindings4/PRE_BUILD
+++ b/kde4/kdebindings4/PRE_BUILD
@@ -1,3 +1,5 @@
-mk_source_dir $SOURCE_DIRECTORY &&
- unpack_file &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-pyqt4-build.patch
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-pyqt4-build.patch &&
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig:" \
+ ./cmake/modules/CMakeCSharpInformation.cmake
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index a6164ce..cbee20f 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,8 @@
+2010-11-25 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added, hack the build system to install pc files
+ in /usr/lib/pkgconfig
+ * INSTALL: removed, fixed the problem in PRE_BUILD
+
2010-11-03 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.5.3

diff --git a/kde4/kdegraphics4/INSTALL b/kde4/kdegraphics4/INSTALL
deleted file mode 100755
index b935451..0000000
--- a/kde4/kdegraphics4/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-default_install &&
-for pcfile in libkdcraw.pc libkexiv2.pc libkipi.pc libksane.pc; do
- ln -sf $INSTALL_ROOT/opt/kde4/lib/pkgconfig/$pcfile
$INSTALL_ROOT/usr/lib/pkgconfig/
-done
diff --git a/kde4/kdegraphics4/PRE_BUILD b/kde4/kdegraphics4/PRE_BUILD
new file mode 100755
index 0000000..38e7e81
--- /dev/null
+++ b/kde4/kdegraphics4/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig:" \
+ libs/libkexiv2/CMakeLists.txt &&
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig/:" \
+ libs/libksane/CMakeLists.txt &&
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig/:" \
+ libs/libkdcraw/CMakeLists.txt &&
+sedit "s:\${LIB_INSTALL_DIR}/pkgconfig:$INSTALL_ROOT/usr/lib/pkgconfig/:" \
+ libs/libkipi/CMakeLists.txt


  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (770a9357b0222eb08edb95fb836fb503d9ec8c60), Bor Kraljič, 11/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page