[Libreoffice-commits] core.git: 2 commits - external/libmspub icon-themes/elementary icon-themes/elementary_svg

[Stephan Bergmann (via logerrit)]

 external/libmspub/UnpackedTarball_libmspub.mk |    2 ++
 icon-themes/elementary/links.txt              |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 895a56d7897884f06e5425519cdcd2bd91dd64a2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 11 15:09:19 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jun 12 07:51:48 2019 +0200

    Mark external/libmspub/stdint.patch as sent upstream
    
    Change-Id: Ib04a69528bf12ab1f549b94413ff7c42b5008482
    Reviewed-on: https://gerrit.libreoffice.org/73825
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
index 1451f723e316..3588b33f0334 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0))
 
+# * external/libmspub/stdint.patch is upstream at <https://gerrit.libreoffice.org/#/c/73814/>
+#   "missing include":
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
     external/libmspub/ubsan.patch \
     external/libmspub/stdint.patch \
commit ab09fa72f2b7b1ce9da00b4e9cb12bd0841f7820
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Fri Jun 7 00:04:18 2019 -0700
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Jun 12 07:44:58 2019 +0200

    elementary: Rename icon toolsmacroedit to basicideappear
    
    The icon isn't needed at two places anymore and it's a follow up of
    daba09df247c09db715ca86a6b78365e49bfe034, which removed the menu entry
    toolsmacroedit. Also clean the links.txt file.
    
    Change-Id: I700aebab5f3049ab43b778de8ae6e3e3476ae2a1
    Reviewed-on: https://gerrit.libreoffice.org/73642
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/icon-themes/elementary/cmd/32/toolsmacroedit.png b/icon-themes/elementary/cmd/32/basicideappear.png
similarity index 100%
rename from icon-themes/elementary/cmd/32/toolsmacroedit.png
rename to icon-themes/elementary/cmd/32/basicideappear.png
diff --git a/icon-themes/elementary/cmd/lc_toolsmacroedit.png b/icon-themes/elementary/cmd/lc_basicideappear.png
similarity index 100%
rename from icon-themes/elementary/cmd/lc_toolsmacroedit.png
rename to icon-themes/elementary/cmd/lc_basicideappear.png
diff --git a/icon-themes/elementary/cmd/sc_toolsmacroedit.png b/icon-themes/elementary/cmd/sc_basicideappear.png
similarity index 100%
rename from icon-themes/elementary/cmd/sc_toolsmacroedit.png
rename to icon-themes/elementary/cmd/sc_basicideappear.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 23114436198c..c5a2c94c5e20 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1165,15 +1165,12 @@ cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 # Macro
 cmd/32/macrodialog.png cmd/32/scriptorganizer.png
 cmd/32/macrosmenu.png cmd/32/choosemacro.png
-cmd/32/basicideappear.png cmd/32/toolsmacroedit.png
 
 cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png
 cmd/lc_macrosmenu.png cmd/lc_choosemacro.png
-cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png
 
 cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png
 cmd/sc_macrosmenu.png cmd/sc_choosemacro.png
-cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png
 
 
 # Outline
diff --git a/icon-themes/elementary_svg/cmd/32/toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/32/basicideappear.svg
similarity index 100%
rename from icon-themes/elementary_svg/cmd/32/toolsmacroedit.svg
rename to icon-themes/elementary_svg/cmd/32/basicideappear.svg
diff --git a/icon-themes/elementary_svg/cmd/lc_toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/lc_basicideappear.svg
similarity index 100%
rename from icon-themes/elementary_svg/cmd/lc_toolsmacroedit.svg
rename to icon-themes/elementary_svg/cmd/lc_basicideappear.svg
diff --git a/icon-themes/elementary_svg/cmd/sc_toolsmacroedit.svg b/icon-themes/elementary_svg/cmd/sc_basicideappear.svg
similarity index 100%
rename from icon-themes/elementary_svg/cmd/sc_toolsmacroedit.svg
rename to icon-themes/elementary_svg/cmd/sc_basicideappear.svg