[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 9e8537d427eb2740f276e9a2ff345218950df1c0
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 461fb2786347f6e6d513b4142ce729e37c2c3743
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Feb 22 01:35:08 2011 +0100
reenabling human icons
diff --git a/patches/human-icons-add.diff b/patches/human-icons-add.diff
new file mode 100644
index 0000000..2850f25
--- /dev/null
+++ b/patches/human-icons-add.diff
@@ -0,0 +1,91 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index c47179f..f26c527 100755
+--- a/patches/dev300/apply
++++ b/patches/dev300/apply
+@@ -1562,8 +1562,7 @@ ubuntu-palette.diff
+ #ubuntu-lpi-help-translate.diff, i#64895, mklose
+ #ubuntu-lpi-bugs.diff, i#64895, mklose
+ ubuntu-sparc-hack.diff, mklose
+-# FIXME: update for LO
+-#human-icons-add.diff, mklose
++human-icons-add2.diff
+ ubuntu-no-stack-protector.diff, doko
+ #gccXXXXX.solenv.javaregistration.diff
+ ubuntu-mstopdf.diff, ccheney
+diff --git a/patches/dev300/human-icons-add2.diff b/patches/dev300/human-icons-add2.diff
+new file mode 100644
+index 0000000..fd66c71
+--- /dev/null
++++ b/patches/dev300/human-icons-add2.diff
+@@ -0,0 +1,71 @@
++diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
++index 5961177..9c8a0cc 100644
++--- a/packimages/pack/makefile.mk
+++++ b/packimages/pack/makefile.mk
++@@ -38,13 +38,14 @@ IMAGES := $(COMMONBIN)$/images.zip
++ SORTED_LIST=$(RES)$/img$/sorted.lst
++ # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
++ # (Tango fallbacks to Industrial for the missing icons)
++-CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
+++CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic human
++ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
++ CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
++ CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
++
++ CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
++ OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
+++HUMAN_TARBALL=$(TARFILELOCATION)$/..$/ext-human-images/ooo_human_images-2011-02-22.tar.gz
++ CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
++
++ ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
++@@ -89,9 +90,9 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
++ .IF "$(GUI)"=="UNX"
++ chmod -R g+w $(MISC)$/oxygen
++ .ENDIF
++- @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
+++ @$(TYPE) $@ || echo "ERROR: unpacking $(OXYGEN_TARBALL) failed"
++
++-# unpack the classic icon set
+++# unpack the Classic icon set
++ $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
++ cd $(MISC) && gzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
++ .IF "$(GUI)"=="UNX"
++@@ -99,12 +100,21 @@ $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
++ .ENDIF
++ @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
++
+++# unpack the Human icon set
+++$(MISC)$/human.flag : $(HUMAN_TARBALL)
+++ cd $(MISC) && gzip -d -c $(HUMAN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+++.IF "$(GUI)"=="UNX"
+++ chmod -R g+w $(MISC)$/human
+++.ENDIF
+++ @$(TYPE) $@ || echo "ERROR: unpacking $(HUMAN_TARBALL) failed"
+++
++ # dependencies
++-images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst
+++images_hicontrast : $(MISC)$/hicontrast.flag
++
++-images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
+++images_crystal : $(MISC)$/crystal.flag
++
++-images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
+++images_oxygen : $(MISC)$/oxygen.flag
++
++-images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
+++images_classic : $(MISC)$/classic.flag
++
+++images_human : $(MISC)$/human.flag
++diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
++index ddcaf0d..67c3311 100644
++--- a/vcl/source/app/settings.cxx
+++++ b/vcl/source/app/settings.cxx
++@@ -825,7 +825,7 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
++ {
++ if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
++ rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
++- nRet = STYLE_SYMBOLS_TANGO;
+++ nRet = STYLE_SYMBOLS_HUMAN;
++ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
++ nRet = STYLE_SYMBOLS_CRYSTAL;
++ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
diff --git a/patches/series b/patches/series
index dbe71c7..8e30f0a 100644
--- a/patches/series
+++ b/patches/series
@@ -7,3 +7,4 @@ bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
desktop-templates.diff
desktop-translations.diff
+human-icons-add.diff
--
LibreOffice packaging repository
Reply to: