Author: ranger
Date: Sat Mar  7 06:21:02 2009
New Revision: 1376

URL: 
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1376&repname=user%3a+ranger>
Log:
amarok2 and koffice2 WIP

Added:
    trunk/experimental/10.4/main/finkinfo/kde/koffice2.info
    trunk/experimental/common/main/finkinfo/kde/koffice2.info
Modified:
    trunk/experimental/10.4/main/finkinfo/kde/amarok2.info
    trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch
    trunk/experimental/common/main/finkinfo/kde/amarok2.info
    trunk/experimental/common/main/finkinfo/kde/amarok2.patch

Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.info&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.info Sat Mar  7 06:21:02 
2009
@@ -40,17 +40,18 @@
        soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
        strigi-dev (>= 0.6.3-1),
        taglib (>= 1.5-1),
-       (-%type_pkg[kde] = x11) x11-dev,
+       (%type_pkg[kde] = x11) x11-dev,
        system-openssl-dev
 <<
 GCC: 4.0
 
 Source: mirror:kde:stable/amarok/%v/src/amarok-%v.tar.bz2
 Source-MD5: 98b78372ec6ea3432faba356c90c6dbe
-PatchScript:   patch -p1 < %{PatchFile}
 PatchFile: amarok2.patch
-PatchFile-MD5: 656981dd158dddcd961a780a64f30094
+PatchFile-MD5: 09bbe745f68f8f302973728e4e5428d1
 
+SetMAKEFLAGS: -j1
+NoSetMAKEFLAGS: true
 CompileScript: <<
 #!/bin/sh -ev
 
@@ -62,7 +63,7 @@
        mkdir -p build
        pushd build
                touch config.h
-               cmake $KDE4_CMAKE_ARGS -DBUILD_po:BOOL=OFF ..
+               cmake $KDE4_CMAKE_ARGS -DBUILD_po:BOOL=OFF 
__KDE_HAVE_GCC_VISIBILITY:BOOL=OFF ..
                make VERBOSE=1
        popd
 <<

Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch Sat Mar  7 06:21:02 
2009
@@ -1,6 +1,6 @@
-diff -Nurd amarok-2.0.1.1/src/context/CMakeLists.txt 
amarok-2.0.1.1-new/src/context/CMakeLists.txt
---- amarok-2.0.1.1/src/context/CMakeLists.txt  2009-01-06 07:50:08.000000000 
-0500
-+++ amarok-2.0.1.1-new/src/context/CMakeLists.txt      2009-02-17 
12:17:58.000000000 -0500
+diff -Nurd amarok-2.0.2/src/context/CMakeLists.txt 
amarok-2.0.2-new/src/context/CMakeLists.txt
+--- amarok-2.0.2/src/context/CMakeLists.txt    2009-03-01 12:21:52.000000000 
-0500
++++ amarok-2.0.2-new/src/context/CMakeLists.txt        2009-03-06 
22:37:27.000000000 -0500
 @@ -10,6 +10,7 @@
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
                      ..
@@ -9,9 +9,9 @@
                      ${CMAKE_CURRENT_BINARY_DIR}/..)
  
  
-diff -Nurd amarok-2.0.1.1/src/metadata/mp4/mp4properties.cpp 
amarok-2.0.1.1-new/src/metadata/mp4/mp4properties.cpp
---- amarok-2.0.1.1/src/metadata/mp4/mp4properties.cpp  2009-01-06 
07:49:06.000000000 -0500
-+++ amarok-2.0.1.1-new/src/metadata/mp4/mp4properties.cpp      2009-02-17 
12:18:22.000000000 -0500
+diff -Nurd amarok-2.0.2/src/metadata/mp4/mp4properties.cpp 
amarok-2.0.2-new/src/metadata/mp4/mp4properties.cpp
+--- amarok-2.0.2/src/metadata/mp4/mp4properties.cpp    2009-03-01 
12:21:28.000000000 -0500
++++ amarok-2.0.2-new/src/metadata/mp4/mp4properties.cpp        2009-03-06 
22:37:27.000000000 -0500
 @@ -19,6 +19,7 @@
   *   MA  02110-1301  USA                                                   *
   ***************************************************************************/

Added: trunk/experimental/10.4/main/finkinfo/kde/koffice2.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/kde/koffice2.info&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/koffice2.info (added)
+++ trunk/experimental/10.4/main/finkinfo/kde/koffice2.info Sat Mar  7 06:21:02 
2009
@@ -1,0 +1,122 @@
+Info2: <<
+Package: koffice2-%type_pkg[kde]
+Version: 1.9.98.7
+Revision: 1
+Description: KDE4 - office suite
+Type: kde (x11 mac)
+License: GPL/LGPL
+Maintainer: Benjamin Reed <koffi...@fink.racoonfink.com>
+
+Depends: <<
+       dbus (>= 1.2.12-1),
+       kdebase4-%type_pkg[kde] (>= 4.2.0-1),
+       kdelibs4-%type_pkg[kde] (>= 4.2.0-1)
+<<
+BuildDepends: <<
+       automoc-%type_pkg[kde],
+       cmake (>= 2.6.3-1),
+       dbus-dev (>= 1.2.12-1),
+       fink (>= 0.28.0-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       glib2-dev (>= 2.14.0-1),
+       kde4-buildenv (>= 4.2.1-2),
+       kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       libgettext3-dev,
+       libxml2,
+       libxslt,
+       pkgconfig (>= 0.22-3),
+       qt4-%type_pkg[kde] (>= 4.4.3-1),
+       soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
+       strigi-dev (>= 0.6.3-1),
+       (%type_pkg[kde] = x11) x11-dev,
+       system-openssl-dev
+<<
+GCC: 4.0
+
+Source: mirror:kde:unstable/koffice-%v/src/koffice-%v.tar.bz2
+Source-MD5: 1b44eb284f35d148ea6aacb0f2408277
+
+CompileScript: <<
+#!/bin/sh -ev
+
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+       . %p/sbin/kde4-buildenv.sh
+
+       mkdir -p build
+       pushd build
+               touch config.h
+               cmake $KDE4_CMAKE_ARGS ..
+               make VERBOSE=1
+       popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+       pushd build
+               make -j1 install DESTDIR="%d"
+       popd
+<<
+
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null 
2>&1 || :
+
+DescDetail: KOffice is a free, integrated office suite for KDE, the K Desktop 
Environment.
+DescUsage: <<
+---[ Installation ]---------------------------------------------------
+
+To install all of the official KDE packages, install "bundle-kde" or
+"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
+downloading strong cryptography).  Unless you have a specific reason
+not to, "bundle-kde-ssl" is suggested.
+
+---[ Configuration ]--------------------------------------------------
+
+To use KDE as your windowing system in XDarwin, create a file called
+".xinitrc" in your home directory, containing the following line:
+
+  /sw/bin/startkde >/tmp/kde.log 2>&1
+
+See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
+for more information on the xinitrc files and how they work.
+
+If you want to use Apple's X11 instead of the KDE window manager,
+put the following line before the startkde line in .xinitrc:
+
+  export KDEWM=quartz-wm
+
+If you want to disable quartz-wm even for clipboard synchronization
+(proxying), put the following line before the startkde line in
+.xinitrc:
+
+  export DISABLE_PROXY=1
+
+---[ Startup ]--------------------------------------------------------
+
+Once you have created an ~/.xinitrc file, you should be able to start
+KDE by clicking on the "XDarwin" icon in your Applications folder.  
+
+NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
+If you run KDE in rootless mode, it will take over your desktop with
+a window that covers everything up.  You can remove this by disabling
+desktop icons in the KDE control center.  Open the control center
+(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
+then expand the "Desktop" list, click "Behavior", and uncheck the
+"Show icons on desktop" checkbox.
+   
+---[ Removal ]--------------------------------------------------------
+   
+To remove all of the official KDE packages, you can remove the KDE
+libraries and anything that depends on them by running, in a terminal:
+   
+  sudo apt-get remove kdelibs3-unified-shlibs
+
+To remove an individual KDE package collection (like kdenetwork3 or
+kdesdk3) you can generally remove [package]-base.  For example, to
+remove all of the kdenetwork3 packages, run:
+
+  sudo apt-get remove kdenetwork3-base
+<<
+<<
+

Modified: trunk/experimental/common/main/finkinfo/kde/amarok2.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.info&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/amarok2.info Sat Mar  7 
06:21:02 2009
@@ -16,13 +16,8 @@
 Source: mirror:kde:stable/amarok/%v/src/amarok-%v.tar.bz2
 Source-MD5: 98b78372ec6ea3432faba356c90c6dbe
 PatchFile: amarok2.patch
-PatchFile-MD5: 656981dd158dddcd961a780a64f30094
+PatchFile-MD5: 09bbe745f68f8f302973728e4e5428d1
 
-PatchScript: <<
-       patch -p1 < %{PatchFile}
-<<
-
-#      %N-shlibs (= %v-%r),
 Depends: <<
        dbus (>= 1.2.12-1),
        kdebase4-%type_pkg[kde] (>= 4.2.0-1),
@@ -65,11 +60,14 @@
        soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
        strigi-dev (>= 0.6.3-1),
        taglib (>= 1.5-1),
-       (-%type_pkg[kde] = x11) x11-dev,
+       (%type_pkg[kde] = x11) x11-dev,
        system-openssl-dev
 <<
 GCC: 4.0
 
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+  
 CompileScript: <<
 #!/bin/sh -ev
 
@@ -81,7 +79,7 @@
        mkdir -p build
        pushd build
                touch config.h
-               cmake $KDE4_CMAKE_ARGS -DBUILD_po:BOOL=OFF ..
+               cmake $KDE4_CMAKE_ARGS -DBUILD_po:BOOL=OFF 
__KDE_HAVE_GCC_VISIBILITY:BOOL=OFF ..
                make VERBOSE=1
        popd
 <<

Modified: trunk/experimental/common/main/finkinfo/kde/amarok2.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.patch&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/amarok2.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/amarok2.patch Sat Mar  7 
06:21:02 2009
@@ -1,6 +1,6 @@
-diff -Nurd amarok-2.0.1.1/src/context/CMakeLists.txt 
amarok-2.0.1.1-new/src/context/CMakeLists.txt
---- amarok-2.0.1.1/src/context/CMakeLists.txt  2009-01-06 07:50:08.000000000 
-0500
-+++ amarok-2.0.1.1-new/src/context/CMakeLists.txt      2009-02-17 
12:17:58.000000000 -0500
+diff -Nurd amarok-2.0.2/src/context/CMakeLists.txt 
amarok-2.0.2-new/src/context/CMakeLists.txt
+--- amarok-2.0.2/src/context/CMakeLists.txt    2009-03-01 12:21:52.000000000 
-0500
++++ amarok-2.0.2-new/src/context/CMakeLists.txt        2009-03-06 
22:37:27.000000000 -0500
 @@ -10,6 +10,7 @@
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
                      ..
@@ -9,9 +9,9 @@
                      ${CMAKE_CURRENT_BINARY_DIR}/..)
  
  
-diff -Nurd amarok-2.0.1.1/src/metadata/mp4/mp4properties.cpp 
amarok-2.0.1.1-new/src/metadata/mp4/mp4properties.cpp
---- amarok-2.0.1.1/src/metadata/mp4/mp4properties.cpp  2009-01-06 
07:49:06.000000000 -0500
-+++ amarok-2.0.1.1-new/src/metadata/mp4/mp4properties.cpp      2009-02-17 
12:18:22.000000000 -0500
+diff -Nurd amarok-2.0.2/src/metadata/mp4/mp4properties.cpp 
amarok-2.0.2-new/src/metadata/mp4/mp4properties.cpp
+--- amarok-2.0.2/src/metadata/mp4/mp4properties.cpp    2009-03-01 
12:21:28.000000000 -0500
++++ amarok-2.0.2-new/src/metadata/mp4/mp4properties.cpp        2009-03-06 
22:37:27.000000000 -0500
 @@ -19,6 +19,7 @@
   *   MA  02110-1301  USA                                                   *
   ***************************************************************************/

Added: trunk/experimental/common/main/finkinfo/kde/koffice2.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice2.info&rev=1376&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice2.info (added)
+++ trunk/experimental/common/main/finkinfo/kde/koffice2.info Sat Mar  7 
06:21:02 2009
@@ -1,0 +1,73 @@
+Info2: <<
+Package: koffice2-%type_pkg[kde]
+Version: 1.9.98.7
+Revision: 1
+Type: kde (x11 mac)
+Description: KDE4 - office suite
+License: GPL/LGPL
+Maintainer: Benjamin Reed <koffi...@fink.racoonfink.com>
+
+DescDetail: <<
+KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
+<<
+
+Source: mirror:kde:unstable/koffice-%v/src/koffice-%v.tar.bz2
+Source-MD5: 1b44eb284f35d148ea6aacb0f2408277
+#PatchFile: koffice2.patch
+#PatchFile-MD5: 09bbe745f68f8f302973728e4e5428d1
+
+#      %N-shlibs (= %v-%r),
+Depends: <<
+       dbus (>= 1.2.12-1),
+       kdebase4-%type_pkg[kde] (>= 4.2.0-1),
+       kdelibs4-%type_pkg[kde] (>= 4.2.0-1)
+<<
+
+BuildDepends: <<
+       automoc-%type_pkg[kde],
+       cmake (>= 2.6.3-1),
+       dbus-dev (>= 1.2.12-1),
+       fink (>= 0.28.0-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       glib2-dev (>= 2.14.0-1),
+       kde4-buildenv (>= 4.2-3),
+       kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+       libgettext3-dev,
+       libxml2,
+       libxslt,
+       pkgconfig (>= 0.22-3),
+       qt4-%type_pkg[kde] (>= 4.4.0-1),
+       soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
+       strigi-dev (>= 0.6.3-1),
+       (%type_pkg[kde] = x11) x11-dev,
+       system-openssl-dev
+<<
+GCC: 4.0
+
+CompileScript: <<
+#!/bin/sh -ev
+
+       export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+       . %p/sbin/kde4-buildenv.sh
+
+       mkdir -p build
+       pushd build
+               touch config.h
+               cmake $KDE4_CMAKE_ARGS ..
+               make VERBOSE=1
+       popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+       pushd build
+               make -j1 install DESTDIR="%d"
+       popd
+<<
+
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null 
2>&1 || :
+
+<<


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to