[Git][archlinux/packaging/packages/freecad][main] Proper desktop file and icon names

[@arodseth]

Alexander Rødseth pushed to branch main at Arch Linux / Packaging / Packages / 
freecad


Commits:
20f18896 by Martin Rodriguez Reboredo at 2024-05-10T18:52:33-03:00
Proper desktop file and icon names

- - - - -


2 changed files:

- PKGBUILD
- + desktop-icon-under-wayland.patch


Changes:

=====================================
PKGBUILD
=====================================
@@ -33,6 +33,7 @@ source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver";
         62c3836c.patch
         https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
         https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch
+        desktop-icon-under-wayland.patch
         fixups-with-qt6-enums.patch)
 
b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
         
'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
@@ -40,6 +41,7 @@ 
b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23
         
'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f'
         
'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc'
         
'02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe'
+        
'6ef009021e507b9291f60c9479148a9697f1da4d9965e26575d74c612162431a0fc61de2e3856d8ed51ca10d9b7f6c9d25a24ad86e9acadd30c0176646c682a3'
         
'9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722')
 
 prepare() {
@@ -48,6 +50,7 @@ prepare() {
   patch -d freecad -Np1 -i ../pyside6.patch
   patch -d freecad -Np1 -i ../ac9a88c2.patch # Fix more pyside6 issues
   patch -d freecad -Np1 -i ../6043c904.patch # Fix build with Python 3.12
+  patch -d freecad -Np1 -i ../desktop-icon-under-wayland.patch # Install 
desktop file and icon with the proper name
   patch -d freecad -Np1 -i ../fixups-with-qt6-enums.patch # Discard int 
conversions in WBs Python sources
   sed -e 
's|Shiboken::Module::getTypes(requiredModule)|reinterpret_cast<PyTypeObject 
**>(Shiboken::Module::getTypes(requiredModule))|' \
     -i freecad/src/Gui/PythonWrapper.cpp # Fix build with PySide 6.7


=====================================
desktop-icon-under-wayland.patch
=====================================
@@ -0,0 +1,40 @@
+diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
+index dd032c367b..89e2d2e1a7 100644
+--- a/src/Main/MainGui.cpp
++++ b/src/Main/MainGui.cpp
+@@ -164,7 +164,7 @@ int main( int argc, char ** argv )
+     App::Application::Config()["SplashInfoColor" ] = "#8aadf4"; // light blue 
+     App::Application::Config()["SplashInfoPosition" ] = "6,75";
+ 
+-    
QGuiApplication::setDesktopFileName(QStringLiteral("org.freecad.FreeCAD.desktop"));
++    
QGuiApplication::setDesktopFileName(QStringLiteral("org.freecad.FreeCAD"));
+ 
+     try {
+         // Init phase 
===========================================================
+diff --git a/src/XDGData/CMakeLists.txt b/src/XDGData/CMakeLists.txt
+index 9c70207f59..8c4cb7c74e 100644
+--- a/src/XDGData/CMakeLists.txt
++++ b/src/XDGData/CMakeLists.txt
+@@ -25,12 +25,12 @@ install(
+ )
+ 
+ install(
+-    FILES org.freecadweb.FreeCAD.desktop
++    FILES org.freecad.FreeCAD.desktop
+     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
+ )
+ 
+ install(
+-    FILES org.freecadweb.FreeCAD.svg
++    FILES org.freecad.FreeCAD.svg
+     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
+ )
+ 
+diff --git a/src/XDGData/org.freecadweb.FreeCAD.desktop 
b/src/XDGData/org.freecad.FreeCAD.desktop
+similarity index 100%
+rename from src/XDGData/org.freecadweb.FreeCAD.desktop
+rename to src/XDGData/org.freecad.FreeCAD.desktop
+diff --git a/src/XDGData/org.freecadweb.FreeCAD.svg 
b/src/XDGData/org.freecad.FreeCAD.svg
+similarity index 100%
+rename from src/XDGData/org.freecadweb.FreeCAD.svg
+rename to src/XDGData/org.freecad.FreeCAD.svg



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/freecad/-/commit/20f1889645575581268301153860c5e32b211195

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/freecad/-/commit/20f1889645575581268301153860c5e32b211195
You're receiving this email because of your account on gitlab.archlinux.org.