core.git: sysui/desktop

2024-06-25 Thread Chris Mayo (via logerrit) 
 sysui/desktop/menus/writer.desktop |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a13e4a9edca15a8f3410417ef15c6b002f3de64
Author: Chris Mayo 
AuthorDate: Mon Jun 24 19:20:31 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jun 25 16:20:06 2024 +0200

Remove duplicate vnd.stardivision.writer-global MimeType

Change-Id: Iec722f05ff2770311f36c38c7dd7e69adbbd6daf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169474
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index 6d4ff815f956..200decb40918 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -22,7 +22,7 @@ Icon=writer
 Type=Application
 Categories=Office;WordProcessor;X-Red-Hat-Base;
 Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-MimeType=application/clarisworks;application/docbook+xml;application/macwriteii;application/msword;application/prs.plucker;application/rtf;application/vnd.apple.pages;application/vnd.lotus-wordpro;application/vnd.ms-word;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.palm;application/vnd.stardivision.writer-global;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;applicat
 
ion/vnd.wordperfect;application/wordperfect;application/x-abiword;application/x-aportisdoc;application/x-doc;application/x-extension-txt;application/x-fictionbook+xml;application/x-hwp;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-pocket-word;application/x-sony-bbeb;application/x-starwriter;application/x-starwriter-global;application/x-t602;text/plain;text/rtf;
+MimeType=application/clarisworks;application/docbook+xml;application/macwriteii;application/msword;application/prs.plucker;application/rtf;application/vnd.apple.pages;application/vnd.lotus-wordpro;application/vnd.ms-word;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.palm;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect
 
;application/x-abiword;application/x-aportisdoc;application/x-doc;application/x-extension-txt;application/x-fictionbook+xml;application/x-hwp;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-pocket-word;application/x-sony-bbeb;application/x-starwriter;application/x-starwriter-global;application/x-t602;text/plain;text/rtf;
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and 
Web pages.

core.git: Branch 'libreoffice-24-2' - configure.ac

2024-06-21 Thread Chris Mayo (via logerrit) 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f194fc58594ce7ddb4e3152b59800220070a0403
Author: Chris Mayo 
AuthorDate: Sat May 18 17:13:31 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Fri Jun 21 10:38:15 2024 +0200

Fix bashism in configure tests for curl and libcmis

When /bin/sh is dash:

./configure: 35165: test: yes: unexpected operator
checking whether to enable breakpad... no
./configure: 35218: test: yes: unexpected operator

Causing HAVE_FEATURE_CURL not to be set to 1 and build to fail:

sw/source/ui/misc/translatelangselect.cxx:160:24: error: no member named 
'TranslateDocumentCancellable' in namespace 'SwTranslateHelper'
  160 | SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, 
aConfig, m_bCancelTranslation);
  | ~~~^

Introduced in:

5bf7c2fa5794 ("Fix --disable-curl build", 2023-09-14)

Change-Id: Ifbc4bc1a7cde86101ff13b05ec7cee6836798605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167831
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167909

diff --git a/configure.ac b/configure.ac
index 79373cd08b8d..6c945148b2ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10877,7 +10877,7 @@ AC_SUBST(ICU_MINOR)
 dnl ==
 dnl CURL
 dnl ==
-if test "$enable_curl" == "yes"; then
+if test "$enable_curl" = "yes"; then
 AC_DEFINE([HAVE_FEATURE_CURL])
 fi
 
@@ -10923,7 +10923,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 dnl ==
 dnl libcmis
 dnl ==
-if test "$enable_libcmis" == "yes"; then
+if test "$enable_libcmis" = "yes"; then
 if test "$enable_curl" != "yes"; then
 AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is 
used])
 fi

core.git: configure.ac

2024-05-21 Thread Chris Mayo (via logerrit) 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4dd9e8fd585210a31bd8a99630a4d958d794ab28
Author: Chris Mayo 
AuthorDate: Sat May 18 17:13:31 2024 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Tue May 21 12:50:09 2024 +0200

Fix bashism in configure tests for curl and libcmis

When /bin/sh is dash:

./configure: 35165: test: yes: unexpected operator
checking whether to enable breakpad... no
./configure: 35218: test: yes: unexpected operator

Causing HAVE_FEATURE_CURL not to be set to 1 and build to fail:

sw/source/ui/misc/translatelangselect.cxx:160:24: error: no member named 
'TranslateDocumentCancellable' in namespace 'SwTranslateHelper'
  160 | SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, 
aConfig, m_bCancelTranslation);
  | ~~~^

Introduced in:

5bf7c2fa5794 ("Fix --disable-curl build", 2023-09-14)

Change-Id: Ifbc4bc1a7cde86101ff13b05ec7cee6836798605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167831
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index fbd6196921a5..59f1c97dbef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11079,7 +11079,7 @@ AC_SUBST(ICU_MINOR)
 dnl ==
 dnl CURL
 dnl ==
-if test "$enable_curl" == "yes"; then
+if test "$enable_curl" = "yes"; then
 AC_DEFINE([HAVE_FEATURE_CURL])
 fi
 
@@ -11125,7 +11125,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
 dnl ==
 dnl libcmis
 dnl ==
-if test "$enable_libcmis" == "yes"; then
+if test "$enable_libcmis" = "yes"; then
 if test "$enable_curl" != "yes"; then
 AC_MSG_ERROR([--disable-libcmis must be used when --disable-curl is 
used])
 fi

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/bin sysui/desktop

2020-12-23 Thread Chris Mayo (via logerrit) 
 solenv/bin/assemble-flatpak-appdata-step1.sh |2 +-
 solenv/bin/assemble-flatpak.sh   |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 sysui/desktop/share/create_tree.sh   |6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e98c4be2c87ba5b3f4aedc31388014b320588d4b
Author: Chris Mayo 
AuthorDate: Tue Nov 17 19:24:44 2020 +
Commit: Michael Stahl 
CommitDate: Wed Dec 23 18:19:46 2020 +0100

tdf#135504: Install application metadata in /usr/share/metainfo

Current path /usr/share/appdata is deprecated [1].

[1] 
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4cd4726e9d97e9785140c809d2154357d5d15837)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108180

diff --git a/solenv/bin/assemble-flatpak-appdata-step1.sh 
b/solenv/bin/assemble-flatpak-appdata-step1.sh
index 4658dd45d018..4896cf3f20bc 100755
--- a/solenv/bin/assemble-flatpak-appdata-step1.sh
+++ b/solenv/bin/assemble-flatpak-appdata-step1.sh
@@ -19,7 +19,7 @@
 set -e
 
 ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
-## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
+## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME 
Software
 ## doesn't show more than five screenshots anyway, so restrict to one each from
 ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
 cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 8ca5bcf08c41..9991a0d0d71c 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -63,7 +63,7 @@ done
 
 mkdir -p /app/share/appdata
 "${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1
-"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/appdata/ \
+"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/metainfo/ \
  /app/share/appdata/
 
 ## see

[Libreoffice-commits] core.git: solenv/bin sysui/desktop

2020-12-23 Thread Chris Mayo (via logerrit) 
 solenv/bin/assemble-flatpak-appdata-step1.sh |2 +-
 solenv/bin/assemble-flatpak.sh   |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 sysui/desktop/share/create_tree.sh   |6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4cd4726e9d97e9785140c809d2154357d5d15837
Author: Chris Mayo 
AuthorDate: Tue Nov 17 19:24:44 2020 +
Commit: Michael Stahl 
CommitDate: Wed Dec 23 16:21:31 2020 +0100

tdf#135504: Install application metadata in /usr/share/metainfo

Current path /usr/share/appdata is deprecated [1].

[1] 
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/bin/assemble-flatpak-appdata-step1.sh 
b/solenv/bin/assemble-flatpak-appdata-step1.sh
index 4658dd45d018..4896cf3f20bc 100755
--- a/solenv/bin/assemble-flatpak-appdata-step1.sh
+++ b/solenv/bin/assemble-flatpak-appdata-step1.sh
@@ -19,7 +19,7 @@
 set -e
 
 ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
-## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
+## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME 
Software
 ## doesn't show more than five screenshots anyway, so restrict to one each from
 ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
 cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 8ca5bcf08c41..9991a0d0d71c 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -63,7 +63,7 @@ done
 
 mkdir -p /app/share/appdata
 "${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1
-"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/appdata/ \
+"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/metainfo/ \
  /app/share/appdata/
 
 ## see

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2020-11-20 Thread Chris Mayo (via logerrit) 
 bin/distro-install-desktop-integration |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 07f0e515c055847689121249c29c6baaa35d35e4
Author: Chris Mayo 
AuthorDate: Mon Nov 16 19:23:11 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 20 14:52:38 2020 +0100

Remove unused installation variable GNOME_MIME_THEME

Not used since:
cf9994a4de40 ("do not conflict with GNOME MIME icons (fdo#36551)", 
2011-05-06)

Change-Id: Ie172bc0814a7de661c16891a2a87caba6c10f632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105959
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index e9ddd3370ee2..7e1428ffba69 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -112,7 +112,6 @@ sed -i \
 export PRODUCTVERSION=
 export KDEMAINDIR=$PREFIXDIR
 export PREFIXDIR=${PREFIXDIR}
-export GNOME_MIME_THEME=hicolor
 export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata
 bash ./create_tree.sh
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/CustomTarget_deb.mk sysui/CustomTarget_share.mk sysui/desktop

2020-11-14 Thread Chris Mayo (via logerrit) 
 bin/distro-install-desktop-integration 
|5 
 sysui/CustomTarget_deb.mk  
|1 
 sysui/CustomTarget_share.mk
|   36 ---
 sysui/desktop/freedesktop/freedesktop-menus.spec   
|3 
 sysui/desktop/mimetypes/drawing-template.keys  
|   10 -
 sysui/desktop/mimetypes/drawing.keys   
|   10 -
 sysui/desktop/mimetypes/extension.keys 
|   10 -
 sysui/desktop/mimetypes/formula.keys   
|   10 -
 sysui/desktop/mimetypes/master-document.keys   
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys  
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet.keys
|   10 -
 sysui/desktop/mimetypes/ms-excel-template-12.keys  
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-template-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-word-document-12.keys   
|   10 -
 sysui/desktop/mimetypes/ms-word-document.keys  
|   10 -
 sysui/desktop/mimetypes/ms-word-document2.keys 
|   10 -
 sysui/desktop/mimetypes/ms-word-template-12.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-database.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing-template.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-formula.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-master-document-template.keys
|9 
 sysui/desktop/mimetypes/oasis-master-document.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-presentation-template.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-presentation.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-text-flat-xml.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-text-template.keys   
|9 
 sysui/desktop/mimetypes/oasis-text.keys
|   10 -
 sysui/desktop/mimetypes/oasis-web-template.keys
|   10 -
 sysui/desktop/mimetypes/openoffice.applications
|9 
 sysui/desktop/mimetypes/openoffice.mime
|   95 --
 
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
 |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
 |   10 -
 sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys 
|   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
  |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
   |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
   |   10 -
 sysui/desktop/mimetypes/presentation-template.keys 
|   10 -
 sysui/desktop/mimetypes/presentation.keys  
|   10 -
 sysui/desktop/mimetypes/spreadsheet-template.keys  
|   10 -
 sysui/desktop/mimetypes/spreadsheet.keys   
|   10 -
 sysui/desktop/mimetypes/text-template.keys 
|9 
 sysui/desktop/mimetypes/text.keys  
|

[Libreoffice-commits] core.git: sysui/desktop

2020-11-10 Thread Chris Mayo (via logerrit) 
 sysui/desktop/debian/postinst|   18 +--
 sysui/desktop/debian/postrm  |   18 +--
 sysui/desktop/freedesktop/freedesktop-menus.spec |  114 +--
 sysui/desktop/share/create_tree.sh   |   10 --
 4 files changed, 65 insertions(+), 95 deletions(-)

New commits:
commit 5c5650ab0671c8e4800c8ac3adfe2380059d4a61
Author: Chris Mayo 
AuthorDate: Tue Nov 3 18:51:40 2020 +
Commit: Heiko Tietze 
CommitDate: Tue Nov 10 12:46:36 2020 +0100

tdf#132787: Don't duplicate hicolor icon theme as gnome

GNOME will use the hicolor theme.

Change-Id: I612c6b076544227bf9adf546ad385c6a5ac20ca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105200
Tested-by: Jenkins
Reviewed-by: Chris Mayo 
Reviewed-by: Heiko Tietze 

diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index 604e67605297..dcb91680cb4e 100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -31,17 +31,15 @@ if [ "$1" = "configure" ] ; then  # first install
 update-menus
   fi
   # update icon-cache if already present
-  for theme in gnome hicolor; do
-if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-  # touch it, just in case we cannot find the binary...
-  touch /usr/share/icons/$theme
-  if (which gtk-update-icon-cache); then
-gtk-update-icon-cache /usr/share/icons/$theme
-  fi
-  # ignore errors (e.g. when there is a cache, but no index.theme)
-  true
+  if [ -e /usr/share/icons/hicolor/icon-theme.cache ] ; then
+# touch it, just in case we cannot find the binary...
+touch /usr/share/icons/hicolor
+if (which gtk-update-icon-cache); then
+  gtk-update-icon-cache /usr/share/icons/hicolor
 fi
-  done
+# ignore errors (e.g. when there is a cache, but no index.theme)
+true
+  fi
 fi
 
 # update /etc/mime.types
diff --git a/sysui/desktop/debian/postrm b/sysui/desktop/debian/postrm
index 1cb32d37b3c3..0e6099ea5b43 100755
--- a/sysui/desktop/debian/postrm
+++ b/sysui/desktop/debian/postrm
@@ -11,16 +11,14 @@ if [ "$1" != "purge" ]; then
   if [ -x /usr/bin/update-menus ]; then
 update-menus
   fi
-  for theme in gnome hicolor; do
-if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-  # touch it, just in case we cannot find the binary...
-  touch /usr/share/icons/$theme
-  if (which gtk-update-icon-cache); then
-gtk-update-icon-cache /usr/share/icons/$theme
-  fi
-  # ignore errors (e.g. when there is a cache, but no index.theme)
-  true
+  if [ -e /usr/share/icons/hicolor/icon-theme.cache ] ; then
+# touch it, just in case we cannot find the binary...
+touch /usr/share/icons/hicolor
+if (which gtk-update-icon-cache); then
+  gtk-update-icon-cache /usr/share/icons/hicolor
 fi
-  done
+# ignore errors (e.g. when there is a cache, but no index.theme)
+true
+  fi
 fi
 exit 0
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 8f2f0ce91901..9375f00b902a 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -35,7 +35,6 @@ AutoReqProv: no
 %define _binary_payload w9.gzdio
 
 %define gnome_dir /usr
-%define gnome_mime_theme hicolor
 
 # only symlinks in the package that at the time of building point to 
non-existing files
 %global dont_check_desktop_files 1
@@ -128,62 +127,53 @@ fi
 # not strictly freedesktop-stuff but there is no common naming scheme yet.
 # One proposal is "mime-application:vnd.oasis.opendocument.spreadsheet.png"
 # for e.g. application/vnd.oasis.opendocument.spreadsheet
-link_target_root="%{gnome_dir}/share/icons/%{gnome_mime_theme}"
+link_root="%{gnome_dir}/share/icons/hicolor"
 
-if [ ! -d "${link_target_root}" ]
-then
-  link_target_root="%{gnome_dir}/share/icons/gnome"
-fi
-
-for subdir in `cd ${link_target_root}; ls -d *`
+for subdir in `cd ${link_root}; ls --ignore="*theme*"`
 do
-  link_dir="%{gnome_dir}/share/icons/%{gnome_mime_theme}/$subdir/mimetypes"
-  link_target_dir="../../../gnome/$subdir/mimetypes/"
+  link_dir="${link_root}/$subdir/mimetypes"
 
   test -d "${link_dir}" || mkdir -p "${link_dir}"
-  test -d ${link_dir}/${link_target_dir} || continue
-
-  icon=${link_target_dir}%iconprefix-drawing.png; test -f 
${link_dir}/$icon && ln -sf ${icon} 
${link_dir}/gnome-mime-application-vnd.sun.xml.draw.png
-  icon=${link_target_dir}%iconprefix-drawing-template.png;test -f 
${link_dir}/$icon && ln -sf ${icon} 
${link_dir}/gnome-mime-application-vnd.sun.xml.draw.template.png
-  icon=${link_target_dir}%iconprefix-formula.png; test -f 
${link_dir}/$icon && ln -sf ${icon} 
${link_dir}/gnome-mime-application-vnd.sun.xml.math.png
-  icon=${link_target_dir}%iconprefix-master-document.png; test -f 
${link_dir}/$icon && ln -sf ${icon} 
${link_di

[Libreoffice-commits] core.git: sysui/desktop

2020-11-01 Thread Chris Mayo (via logerrit) 
 sysui/desktop/freedesktop/freedesktop-menus.spec |1 -
 1 file changed, 1 deletion(-)

New commits:
commit be6602e6a055e2b3fd8a606a20b19283e7ad2d5b
Author: Chris Mayo 
AuthorDate: Sat Oct 31 17:42:53 2020 +
Commit: Heiko Tietze 
CommitDate: Sun Nov 1 11:39:14 2020 +0100

Don't try to include hicolor SVG mimetypes icons in rpm

The icons in scalable/mimetypes were multi-image developer files removed
from installation in:
f9ddaae9caa5 ("tdf#132737: Don't install SVG source icons or locolor 
theme", 2020-10-14)

Change-Id: I6c7eda89a145365ffb598a066b7e817f27f4ea9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105081
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 0292478f142d..8f2f0ce91901 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -410,6 +410,5 @@ done
 /usr/share/icons/hicolor/*/apps/*png
 /usr/share/icons/hicolor/*/apps/*svg
 /usr/share/icons/hicolor/*/mimetypes/*png
-/usr/share/icons/hicolor/*/mimetypes/*svg
 /usr/share/mime/packages/*
 /usr/share/appdata/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/desktop

2020-10-29 Thread Chris Mayo (via logerrit) 
 sysui/desktop/debian/postinst|2 +-
 sysui/desktop/debian/postrm  |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |8 ++--
 sysui/desktop/share/create_tree.sh   |2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit f9ddaae9caa5bfebf1b2d763751049125642657b
Author: Chris Mayo 
AuthorDate: Wed Oct 14 19:38:16 2020 +0100
Commit: Heiko Tietze 
CommitDate: Thu Oct 29 09:23:08 2020 +0100

tdf#132737: Don't install SVG source icons or locolor theme

These SVG icons are the source for the PNG icons in the same
directories.

scalable/mimetypes icons each contain the source for all sizes of
PNG icons and are not usable themselves.

The locolor theme is incomplete with only low resolution icons.

Change-Id: I2bc54cfbfec012c29a41e1d954d313c19a47831e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99444
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index 715403fbaffc..604e67605297 100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -31,7 +31,7 @@ if [ "$1" = "configure" ] ; then  # first install
 update-menus
   fi
   # update icon-cache if already present
-  for theme in gnome hicolor locolor; do
+  for theme in gnome hicolor; do
 if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
   # touch it, just in case we cannot find the binary...
   touch /usr/share/icons/$theme
diff --git a/sysui/desktop/debian/postrm b/sysui/desktop/debian/postrm
index adb9cf448e95..1cb32d37b3c3 100755
--- a/sysui/desktop/debian/postrm
+++ b/sysui/desktop/debian/postrm
@@ -11,7 +11,7 @@ if [ "$1" != "purge" ]; then
   if [ -x /usr/bin/update-menus ]; then
 update-menus
   fi
-  for theme in gnome hicolor locolor; do
+  for theme in gnome hicolor; do
 if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
   # touch it, just in case we cannot find the binary...
   touch /usr/share/icons/$theme
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index f646bb7ff8ca..0292478f142d 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -171,7 +171,7 @@ do
 done
 
 #run always
-for theme in gnome hicolor locolor; do
+for theme in gnome hicolor; do
 if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
 # touch it, just in case we cannot find the binary...
 touch /usr/share/icons/$theme
@@ -371,7 +371,7 @@ if [ "$1" = 0 ] ; then # only run when erasing the package 
- other cases handled
 fi
 
 #run always
-for theme in gnome hicolor locolor; do
+for theme in gnome hicolor; do
   if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
# touch it, just in case we cannot find the binary...
 touch /usr/share/icons/$theme
@@ -411,9 +411,5 @@ done
 /usr/share/icons/hicolor/*/apps/*svg
 /usr/share/icons/hicolor/*/mimetypes/*png
 /usr/share/icons/hicolor/*/mimetypes/*svg
-/usr/share/icons/locolor/*/apps/*png
-/usr/share/icons/locolor/*/apps/*svg
-/usr/share/icons/locolor/*/mimetypes/*png
-/usr/share/icons/locolor/*/mimetypes/*svg
 /usr/share/mime/packages/*
 /usr/share/appdata/*
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 36dc4ff7a0e6..0de21a57fa15 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -19,7 +19,7 @@
 umask 022
 
 if [ "${KDEMAINDIR}" ]; then
-  for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? 
hicolor/??x?? hicolor/scalable locolor} -name "*.png" -o -name "*.svg"`
+  for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? 
hicolor/??x??} -name "*.png"; find hicolor/scalable/apps -name "*.svg"`
   do
 targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname ${i}`
 mkdir -p "${targetdir}"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sysui/desktop

2020-07-24 Thread Chris Mayo (via logerrit) 
 sysui/desktop/share/create_tree.sh |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 61959578de5e9a1c536517b1da0fe6c7159c
Author: Chris Mayo 
AuthorDate: Fri May 8 10:35:51 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jul 24 14:46:06 2020 +0200

tdf#132787: Don't duplicate hicolor icon theme as gnome

GNOME will use the hicolor theme.

Change-Id: I3a163fd9b43457063167701c2964a457aac85cb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93712
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Heiko Tietze 
(cherry picked from commit a26a5bb71c32c1cf8c5ad4d2ef79f3ece5065a02)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99307

diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 36dc4ff7a0e6..28467357dee1 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -32,16 +32,6 @@ if [ "${KDEMAINDIR}" ]; then
 fi
 
 if [ "${GNOMEDIR}" ]; then
-  for i in `cd "${ICON_SOURCE_DIR}/hicolor"; find ??x?? ???x??? scalable -name 
"*.png" -o -name "*.svg"`
-  do
-targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname ${i}`
-mkdir -p "${targetdir}"
-destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename ${i}`
-cp "${ICON_SOURCE_DIR}/hicolor/${i}" "${destfile}"
-chmod 0644 "${destfile}"
-  done
-  unset targetdir destfile
-
   mkdir -p "${DESTDIR}/${GNOMEDIR}/share/mime-info"
   cp openoffice.mime "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime"
   cp openoffice.keys "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/desktop

2020-07-24 Thread Chris Mayo (via logerrit) 
 sysui/desktop/share/create_tree.sh |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit a26a5bb71c32c1cf8c5ad4d2ef79f3ece5065a02
Author: Chris Mayo 
AuthorDate: Fri May 8 10:35:51 2020 +0100
Commit: Heiko Tietze 
CommitDate: Fri Jul 24 11:06:56 2020 +0200

tdf#132787: Don't duplicate hicolor icon theme as gnome

GNOME will use the hicolor theme.

Change-Id: I3a163fd9b43457063167701c2964a457aac85cb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93712
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Heiko Tietze 

diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 36dc4ff7a0e6..28467357dee1 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -32,16 +32,6 @@ if [ "${KDEMAINDIR}" ]; then
 fi
 
 if [ "${GNOMEDIR}" ]; then
-  for i in `cd "${ICON_SOURCE_DIR}/hicolor"; find ??x?? ???x??? scalable -name 
"*.png" -o -name "*.svg"`
-  do
-targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname ${i}`
-mkdir -p "${targetdir}"
-destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename ${i}`
-cp "${ICON_SOURCE_DIR}/hicolor/${i}" "${destfile}"
-chmod 0644 "${destfile}"
-  done
-  unset targetdir destfile
-
   mkdir -p "${DESTDIR}/${GNOMEDIR}/share/mime-info"
   cp openoffice.mime "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime"
   cp openoffice.keys "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits