[ooo-build-commit] .: 3 commits - bin/applyflags configure.in patches/dev300

[Fridrich Strba]

 bin/applyflags                                    |    3 ---
 configure.in                                      |    4 ----
 patches/dev300/apply                              |    7 -------
 patches/dev300/odk-configure-honour-ure-link.diff |   16 ----------------
 4 files changed, 30 deletions(-)

New commits:
commit 57bfc5857d8ff857794417d93d7f7145afbdd22f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 17 11:38:46 2010 +0200

    Remove stale reference to OXYGEN_IMAGES_TAR

diff --git a/configure.in b/configure.in
index 26974c8..c61ba90 100644
--- a/configure.in
+++ b/configure.in
@@ -841,10 +841,6 @@ else
    OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
 fi
 
-# Icon themes are not optional
-OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
-AC_SUBST(OXYGEN_IMAGES_TAR)
-
 if test "$enable_gtk" != "no"; then
    if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
commit 43ba40e6f91e14f36cc334456d32514269ab555a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 17 11:36:28 2010 +0200

    Remove empty Sdk* section from everywhere

diff --git a/bin/applyflags b/bin/applyflags
index 956ea8a..9cee051 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -22,9 +22,6 @@ test -n "$builddir" && OOBUILDDIR=$builddir
 
 echo -n "--distro=$DISTRO"
 
-if test -d $OOBUILDDIR/odk; then
-    SECTIONS="$SECTIONS,Sdk"
-fi
 if test -d $OOBUILDDIR/swext -o -d $OOBUILDDIR/sdext -o -d $OOBUILDDIR/reportbuilder; then
     SECTIONS="$SECTIONS,Extensions"
 fi
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b68bf10..9a4897c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -42,8 +42,6 @@ Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
 CT2N : CT2NBits 
 # optional section for NLPSolver extension
 NLPSolver : NLPSolverBits 
-# Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
-Sdk : SdkFixes
 # special fragmented build patch distro
 Piece : PieceBits
 #Localize
@@ -926,8 +924,6 @@ sdk-gid-module-name.diff, pmladek, i#64802
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
-[ SdkFixes ]
-
 [ DebianOnly ]
 open-url-support-iceanimals.diff
 
commit 427aa27732cb8ea8c7746aaaeca6fd893c15eac3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 17 11:34:40 2010 +0200

    odk-configure-honour-ure-link.diff: Migrated to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7f1c4a4..b68bf10 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -927,9 +927,6 @@ sdk-gid-module-name.diff, pmladek, i#64802
 psprint_config-no-orig.diff, jholesov
 
 [ SdkFixes ]
-# fix configure.pl
-# FIXME: thorsten wants to look at this one
-#odk-configure-honour-ure-link.diff
 
 [ DebianOnly ]
 open-url-support-iceanimals.diff
diff --git a/patches/dev300/odk-configure-honour-ure-link.diff b/patches/dev300/odk-configure-honour-ure-link.diff
deleted file mode 100644
index 4646410..0000000
--- a/patches/dev300/odk-configure-honour-ure-link.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- odk/configure.pl-old	2010-07-09 16:48:56.000000000 +0200
-+++ odk/configure.pl	2010-07-09 16:50:37.000000000 +0200
-@@ -31,12 +31,7 @@
- 
- $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
- 
--if ( $main::operatingSystem =~ m/darwin/ )
--{
--#	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
--} else {
--	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
--}
-+$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
- chomp($main::OO_SDK_URE_HOME);
- 
- $main::OO_SDK_MAKE_HOME = "";