[Lunar-commits] <moonbase> kdenetwork4: Adding a patch to fix a build failure with the latest openssl bump.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Mon Apr 12 18:06:41 CEST 2010


commit dbe907305f184c70e254c95aa69cca8bc852b0dd
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Apr 12 12:06:41 2010 -0400

    kdenetwork4: Adding a patch to fix a build failure with the latest openssl bump.
    
    Made a couple of other adjustments in DEPENDS and BUILD.
---
 kde4/base/kdenetwork4/BUILD   |   13 ++++++++++---
 kde4/base/kdenetwork4/DEPENDS |   24 ++++++++++++------------
 kde4/base/kdenetwork4/DETAILS |    3 +++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/kde4/base/kdenetwork4/BUILD b/kde4/base/kdenetwork4/BUILD
index 2d1fd8e..592904d 100644
--- a/kde4/base/kdenetwork4/BUILD
+++ b/kde4/base/kdenetwork4/BUILD
@@ -5,12 +5,19 @@
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
+  if [ ! -d /opt/lunar/plugins ] ; then
+    mkdir /opt/lunar/plugins
+  fi &&
+
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+
   mkdir $KDE4_BUILD_DIR  &&
   cd $KDE4_BUILD_DIR     &&
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE             \
-                           $OPTS                                 &&
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX       \
+                           -DCMAKE_BUILD_TYPE=RELEASE                  \
+                           -DMOZPLUGIN_INSTALL_DIR=/opt/lunar/plugins  \
+                           $OPTS                                      &&
 
   default_make
 
diff --git a/kde4/base/kdenetwork4/DEPENDS b/kde4/base/kdenetwork4/DEPENDS
index 230cb21..1372c0b 100644
--- a/kde4/base/kdenetwork4/DEPENDS
+++ b/kde4/base/kdenetwork4/DEPENDS
@@ -1,15 +1,15 @@
 depends kdepimlibs4
 depends libv4l
 
-optional_depends libvncserver ""  ""  "for VNC Server support"
-optional_depends libidn       ""  ""  "Jabber support in kopete"
-optional_depends avahi        ""  ""  "for service discovery support"
-optional_depends qca2         ""  ""  "for crypto API support"
-optional_depends tapioca-qt   ""  ""  "for voip and like support"
-optional_depends xmms         ""  ""  "for kopete nowlistening plugin"
-optional_depends libotr       ""  ""  "for Off The Record support"
-optional_depends meanwhile    ""  ""  "for Sametime Community Client protocol support"
-optional_depends ortp         ""  ""  "for RTP protocol support"
-optional_depends libmsn       ""  ""  "for MSN protocol support"
-optional_depends libgadu      ""  ""  "for Gadu-Gadu protocol support"
-optional_depends libupnp      ""  ""  "for UPnP Device support"
+optional_depends libvncserver  ""  ""  "for VNC Server support"
+optional_depends libidn        ""  ""  "Jabber support in kopete"
+optional_depends avahi         ""  ""  "for service discovery support"
+optional_depends qca2          ""  ""  "for crypto API support"
+optional_depends telepathy-qt4 ""  ""  "for voip and like support"
+optional_depends xmms          ""  ""  "for kopete nowlistening plugin"
+optional_depends libotr        ""  ""  "for Off The Record support"
+optional_depends meanwhile     ""  ""  "for Sametime Community Client protocol support"
+optional_depends ortp          ""  ""  "for RTP protocol support"
+optional_depends libmsn        ""  ""  "for MSN protocol support"
+optional_depends libgadu       ""  ""  "for Gadu-Gadu protocol support"
+optional_depends libupnp       ""  ""  "for UPnP Device support"
diff --git a/kde4/base/kdenetwork4/DETAILS b/kde4/base/kdenetwork4/DETAILS
index ec2de08..ae51d5a 100644
--- a/kde4/base/kdenetwork4/DETAILS
+++ b/kde4/base/kdenetwork4/DETAILS
@@ -2,9 +2,12 @@
            MAJOR=4.4
          VERSION=${MAJOR}.2
           SOURCE=kdenetwork-$VERSION.tar.bz2
+         SOURCE2=kdenetwork4-openssl-1.0.0.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/kdenetwork-$VERSION
       SOURCE_URL=$KDE_URL/stable/$VERSION/src
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:c76ffbae19941d800e3daee54e8fac991f1acec2
+     SOURCE2_VFY=sha1:ab16ccf04ce23b9a272bc74cfb5dcbcf24426a9e
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/opt/lunar/kde/4}
         WEB_SITE=http://www.kde.org
          ENTERED=20071026


More information about the Lunar-commits mailing list