[ooo-build-commit] .: 4 commits - bin/g patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 25 05:10:09 PDT 2010
bin/g | 6 ++
patches/dev300/apply | 17 +------
patches/dev300/gui-toolbox-large-icons.diff | 25 -----------
patches/dev300/scp2-3layer-nicer-paths.diff | 62 ----------------------------
patches/dev300/tango-icons-default-w32.diff | 21 ---------
5 files changed, 9 insertions(+), 122 deletions(-)
New commits:
commit b1b347c87de82d6ab58e26643a03b2511bddb25b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 13:36:39 2010 +0200
Don't output status of unchanged repos.
diff --git a/bin/g b/bin/g
index 790ef9e..b7fc1e9 100755
--- a/bin/g
+++ b/bin/g
@@ -123,6 +123,12 @@ for DIR in * ; do
push)
git status | grep -qs '^# Your branch is ahead of' || exit 0
;;
+ status)
+ AHEAD="`git status | grep '^# Your branch is ahead of'`"
+ if [ -z "$AHEAD" ] ; then
+ git status | grep -qs '^nothing to commit' && exit 0
+ fi
+ ;;
esac
[ "$COMMAND" != 'diff' ] && echo "===== $DIR ====="
commit d8e04ec96296fb5f6bce7cedaadfed534565b6e8
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 14:06:51 2010 +0200
Moved tango-icons-default-w32.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 94da58e..15141bf 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -21,14 +21,13 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
Toolbars, MySQL, BorderTypes, WriterNavigation
-LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
+LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, \
Fpickers, Mono, AddressBooks, QuickStarter, KDE4, Netbook, \
GlobalNSPluginSupport, SystemBitsWithSTLport
-MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
-Win32Common : Common, Defaults, TangoIcons, \
- Win32Only, NotDebian, BuildFixWin32
+MacOSXCommon : Common, Defaults, SystemBits
+Win32Common : Common, Defaults, Win32Only, NotDebian, BuildFixWin32
# Experimental sections
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
@@ -1338,10 +1337,6 @@ hebrew-culmus.diff, noelpwer
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
-[ TangoIcons ]
-# use it by default under Win32
-tango-icons-default-w32.diff, n#254855, pmladek
-
[ NotDebian ]
# Improve readability of BUILD_VER_STRING in Help:About dialog
diff --git a/patches/dev300/tango-icons-default-w32.diff b/patches/dev300/tango-icons-default-w32.diff
deleted file mode 100644
index 2213f14..0000000
--- a/patches/dev300/tango-icons-default-w32.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- vcl/source/app/settings.cxx | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
-index 22ca7dc..467fdd1 100755
---- vcl/source/app/settings.cxx
-+++ vcl/source/app/settings.cxx
-@@ -825,7 +825,8 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
-
- if( bCont )
- {
-- if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
-+ if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
-+ rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
- nRet = STYLE_SYMBOLS_TANGO;
- else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- nRet = STYLE_SYMBOLS_CRYSTAL;
---
-1.7.0.1
-
commit fac37b65506f094a70948116d94f7e6049240d48
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 13:48:42 2010 +0200
Moved gui-toolbox-large-icons.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 27a10e7..94da58e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1339,9 +1339,6 @@ hebrew-culmus.diff, noelpwer
vcl-bitmap2-negative-height.diff
[ TangoIcons ]
-# default to large icons in the toolbar
-gui-toolbox-large-icons.diff, jholesov
-
# use it by default under Win32
tango-icons-default-w32.diff, n#254855, pmladek
diff --git a/patches/dev300/gui-toolbox-large-icons.diff b/patches/dev300/gui-toolbox-large-icons.diff
deleted file mode 100644
index bff7f8d..0000000
--- a/patches/dev300/gui-toolbox-large-icons.diff
+++ /dev/null
@@ -1,25 +0,0 @@
----
- .../schema/org/openoffice/Office/Common.xcs | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index 4e43df8..cd948f9 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -5760,11 +5760,11 @@
- </enumeration>
- <enumeration oor:value="1">
- <info>
-- <desc>32x32 pixel icons</desc>
-+ <desc>larger icons</desc>
- </info>
- </enumeration>
- </constraints>
-- <value>0</value>
-+ <value>1</value>
- </prop>
- <prop oor:name="SymbolStyle" oor:type="xs:string">
- <!-- UIHints: Tools Options General View -->
---
-1.7.0.1
-
commit 5d62061cdb77cb0210416959ee06d1128250518a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 13:38:03 2010 +0200
Moved tango-prefer-over-industrial.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 48a1b5e..27a10e7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1154,9 +1154,6 @@ default-no-registration-menu.diff, michael
# CR line endings again...
default-no-registration-menu-sd.diff, michael/kohei
-# flatten the structure of the 3 layer OOo a bit
-scp2-3layer-nicer-paths.diff, i#90430, jholesov
-
# disable checkdeliver, no point in doing that, especially when we
# hardlink to solver instead of copying :-)
disable-checkdeliver.diff, jholesov
diff --git a/patches/dev300/scp2-3layer-nicer-paths.diff b/patches/dev300/scp2-3layer-nicer-paths.diff
deleted file mode 100644
index 7b2c90c..0000000
--- a/patches/dev300/scp2-3layer-nicer-paths.diff
+++ /dev/null
@@ -1,62 +0,0 @@
----
- scp2/source/ooo/common_brand.scp | 2 +-
- scp2/source/ooo/directory_ooo.scp | 2 +-
- scp2/source/ooo/ooo_brand.scp | 2 +-
- scp2/source/sdkoo/sdkoo.scp | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
-index fdd03fa..0fffeaa 100644
---- scp2/source/ooo/common_brand.scp
-+++ scp2/source/ooo/common_brand.scp
-@@ -263,7 +263,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
-- Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
-+ Target = "basis${OOOBASEVERSION}";
- End
- #endif
-
-diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
-index cc805f9..5bcd887 100644
---- scp2/source/ooo/directory_ooo.scp
-+++ scp2/source/ooo/directory_ooo.scp
-@@ -75,7 +75,7 @@ Directory gid_Dir_Ooo_Openofficeorg
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
-- HostName = "${UNIXBASISROOTNAME}";
-+ HostName = ".";
- #endif
- End
- #endif
-diff --git scp2/source/ooo/ooo_brand.scp scp2/source/ooo/ooo_brand.scp
-index 3cd20ef..47df5f2 100644
---- scp2/source/ooo/ooo_brand.scp
-+++ scp2/source/ooo/ooo_brand.scp
-@@ -33,7 +33,7 @@ Directory gid_Dir_Brand_Root
- #ifdef WNT
- HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
- #else
-- HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
-+ HostName = ".";
- #endif
- Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
- End
-diff --git scp2/source/sdkoo/sdkoo.scp scp2/source/sdkoo/sdkoo.scp
-index d47e14d..47181c9 100644
---- scp2/source/sdkoo/sdkoo.scp
-+++ scp2/source/sdkoo/sdkoo.scp
-@@ -60,7 +60,7 @@ Directory gid_Dir_Ooo_Openofficeorg_Sdk
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
-- HostName = "${UNIXBASISROOTNAME}";
-+ HostName = ".";
- #endif
- End
- #endif
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list