From 064b4b8cf237890b87dc81565296b60f76f799f0 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Wed, 20 Nov 2024 19:42:57 -0600 Subject: [PATCH 1/4] Fix Wayland appId Ensure the .desktop file matches the application-id, this fixes window/icon associations on Wayland. Without it the texworks icon may not be associated with the texworks open windows for example. --- res/{texworks.appdata.xml => org.tug.texworks.appdata.xml} | 0 res/{texworks.desktop => org.tug.texworks.desktop} | 0 src/CMakeLists.txt | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename res/{texworks.appdata.xml => org.tug.texworks.appdata.xml} (100%) rename res/{texworks.desktop => org.tug.texworks.desktop} (100%) diff --git a/res/texworks.appdata.xml b/res/org.tug.texworks.appdata.xml similarity index 100% rename from res/texworks.appdata.xml rename to res/org.tug.texworks.appdata.xml diff --git a/res/texworks.desktop b/res/org.tug.texworks.desktop similarity index 100% rename from res/texworks.desktop rename to res/org.tug.texworks.desktop diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5538d110b..391dbf1a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -330,8 +330,8 @@ IF ( UNIX AND NOT APPLE ) ${TeXworks_SOURCE_DIR}/NEWS DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_DOCS_DIR}) INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/texworks.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_MAN_DIR}) - INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/texworks.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_DESKTOP_DIR}) - INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/texworks.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_APPDATA_DIR}) + INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/org.tug.texworks.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_DESKTOP_DIR}) + INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/org.tug.texworks.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_APPDATA_DIR}) ENDIF ( UNIX AND NOT APPLE ) # On OS X, ensure there is always a `qt.conf` file as all hell will break loose From ae96155d7ce4944f06e1cfccd1758b46fd6948cc Mon Sep 17 00:00:00 2001 From: Joey Riches Date: Wed, 27 Nov 2024 08:48:30 +0000 Subject: [PATCH 2/4] Rename appstream metainfo file to match current specification https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location --- ...g.tug.texworks.appdata.xml => org.tug.texworks.metainfo.xml} | 0 scripts/updateCopyrights.py | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename res/{org.tug.texworks.appdata.xml => org.tug.texworks.metainfo.xml} (100%) diff --git a/res/org.tug.texworks.appdata.xml b/res/org.tug.texworks.metainfo.xml similarity index 100% rename from res/org.tug.texworks.appdata.xml rename to res/org.tug.texworks.metainfo.xml diff --git a/scripts/updateCopyrights.py b/scripts/updateCopyrights.py index d7e4ab18f..5787f21e2 100755 --- a/scripts/updateCopyrights.py +++ b/scripts/updateCopyrights.py @@ -129,7 +129,7 @@ def manual_update_notice(): """Reminder for places where the copyright information must be updated manually""" print("") print("Don't forget to manually update the copyright information in the following files:") - for f in ["README.md", "res/texworks.appdata.xml", "res/TeXworks.in.plist", "res/texworks.1", "res/TeXworks.rc", "src/TWApp.cpp", ".github/actions/package-launchpad/launchpad/debian/copyright", "win32/README.win", "CMake/Modules/COPYING-CMAKE-MODULES"]: + for f in ["README.md", "res/texworks.metainfo.xml", "res/TeXworks.in.plist", "res/texworks.1", "res/TeXworks.rc", "src/TWApp.cpp", ".github/actions/package-launchpad/launchpad/debian/copyright", "win32/README.win", "CMake/Modules/COPYING-CMAKE-MODULES"]: print(" {0}".format(f)) def main(): diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 391dbf1a5..e87bef897 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -331,7 +331,7 @@ IF ( UNIX AND NOT APPLE ) DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_DOCS_DIR}) INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/texworks.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_MAN_DIR}) INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/org.tug.texworks.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_DESKTOP_DIR}) - INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/org.tug.texworks.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_APPDATA_DIR}) + INSTALL(FILES ${TeXworks_SOURCE_DIR}/res/org.tug.texworks.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${TeXworks_APPDATA_DIR}) ENDIF ( UNIX AND NOT APPLE ) # On OS X, ensure there is always a `qt.conf` file as all hell will break loose From 4c9d5d7a75e17674837cffdc8a10b80c5484c0a0 Mon Sep 17 00:00:00 2001 From: Joey Riches Date: Wed, 27 Nov 2024 08:50:33 +0000 Subject: [PATCH 3/4] appstream metainfo: Fix id and launchable type Fixes generation with appstream-builder following .desktop rename. Additionally, drop the .desktop from the id as it isn't recommended. --- res/org.tug.texworks.metainfo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/org.tug.texworks.metainfo.xml b/res/org.tug.texworks.metainfo.xml index 0b190abea..227c56e64 100644 --- a/res/org.tug.texworks.metainfo.xml +++ b/res/org.tug.texworks.metainfo.xml @@ -1,7 +1,7 @@ - org.tug.texworks.desktop + org.tug.texworks CC0-1.0 GPL-2.0+ TeXworks @@ -321,7 +321,7 @@ texworks - texworks.desktop + org.tug.texworks.desktop From 0e25fb6d5e1885872f41e7e7c0b12a46f325a2d6 Mon Sep 17 00:00:00 2001 From: Joey Riches Date: Wed, 27 Nov 2024 08:51:53 +0000 Subject: [PATCH 4/4] appstream metainfo: Whitespace cleanup --- res/org.tug.texworks.metainfo.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/res/org.tug.texworks.metainfo.xml b/res/org.tug.texworks.metainfo.xml index 227c56e64..6e5f40579 100644 --- a/res/org.tug.texworks.metainfo.xml +++ b/res/org.tug.texworks.metainfo.xml @@ -117,7 +117,7 @@

TeXworks er eitt umhvørvi til at skriva TeX-skjøl, t.e LaTeX, ConTeXt o.s.fr., við. Tað kemur við einum Unicode-grundaðum ritli, sum kennir til TeX, einum innbygdum - PDF-vísara og einum reinum og einføldum markamóti, sum brúkarar við lítlum tøkniligum + PDF-vísara og einum reinum og einføldum markamóti, sum brúkarar við lítlum tøkniligum innliti kunnu brúka.

@@ -187,14 +187,14 @@

TeXworks는 Dick Koch의 Mac OS X 용 프로그램 TeXShop에서 영향을 받았습니다. - 수상경력에 빛나는 이 프로그램은 접근 곤란한 전문적 기술적 외양을 걷어내어 + 수상경력에 빛나는 이 프로그램은 접근 곤란한 전문적 기술적 외양을 걷어내어 텍을 이용한 고품질 조판을 폭넓은 사용자층에 보급하였습니다. TeXworks의 목표는 이와 같이 사용하기 쉬운 통합적인 환경을 GNU/Linux나 Windows 등 다른 플랫폼 사용자들에게도 제공하는 것입니다.

무엇보다 TeXworks는 PDF 미리보기 기능 내장, 텍 파일과 PDF 결과물 간 연동, - 확장가능한 스크립트 활용 인터페이스 등의 특징을 가지고 있습니다. + 확장가능한 스크립트 활용 인터페이스 등의 특징을 가지고 있습니다.

TeXworks ist een omgeving om documenten voor TeX (LaTeX, ConTeXt, enzovoort) @@ -348,4 +348,3 @@ -