diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 056c4ca..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,61 +0,0 @@ -project(indicator-weather C CXX) -cmake_minimum_required(VERSION 3.0.0) - -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - -find_package(Qt5Core) -find_package(Qt5Qml) -find_package(Qt5Quick) - -# Automatically create moc files -set(CMAKE_AUTOMOC ON) - -# Components PATH -execute_process( - COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH - OUTPUT_VARIABLE ARCH_TRIPLET - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}") - -set(PROJECT_NAME "mines.neothethird") -set(CMAKE_INSTALL_PREFIX /) -set(DATA_DIR /) -set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop) - -# This command figures out the target architecture for use in the manifest file -execute_process( - COMMAND dpkg-architecture -qDEB_HOST_ARCH - OUTPUT_VARIABLE CLICK_ARCH - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR}) -install(DIRECTORY qml DESTINATION ${DATA_DIR}) -install(DIRECTORY assets DESTINATION ${DATA_DIR}) - -# Translations -file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.qml qml/*.js) -list(APPEND I18N_SRC_FILES ${DESKTOP_FILE_NAME}.in.h) - -find_program(INTLTOOL_MERGE intltool-merge) -if(NOT INTLTOOL_MERGE) - message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package") -endif() -find_program(INTLTOOL_EXTRACT intltool-extract) -if(NOT INTLTOOL_EXTRACT) - message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package") -endif() - -add_custom_target(${DESKTOP_FILE_NAME} ALL - COMMENT "Merging translations into ${DESKTOP_FILE_NAME}..." - COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_SOURCE_DIR}/${DESKTOP_FILE_NAME}.in ${DESKTOP_FILE_NAME} - COMMAND sed -i 's/${PROJECT_NAME}-//g' ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} -) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DATA_DIR}) - -add_subdirectory(po) diff --git a/clickable.json b/clickable.json index c98a52c..1d144fd 100644 --- a/clickable.json +++ b/clickable.json @@ -1,4 +1,3 @@ { - "template": "pure-qml-cmake", "kill": "qmlscene" } diff --git a/manifest.json.in b/manifest.json similarity index 82% rename from manifest.json.in rename to manifest.json index 6136bd4..934ad78 100644 --- a/manifest.json.in +++ b/manifest.json @@ -1,6 +1,7 @@ { "name": "mines.neothethird", "description": "Clear the minefield.", + "architecture": "@CLICK_ARCH@", "title": "Mines", "hooks": { "mines": { @@ -10,5 +11,5 @@ }, "version": "1.1", "maintainer": "Jan Sprinz ", - "framework" : "ubuntu-sdk-15.04.6" + "framework" : "ubuntu-sdk-20.04" } diff --git a/mines.neothethird.apparmor b/mines.neothethird.apparmor index ec91af4..540534c 100644 --- a/mines.neothethird.apparmor +++ b/mines.neothethird.apparmor @@ -1,5 +1,5 @@ { "policy_groups": [ ], - "policy_version": 1.3 + "policy_version": 20.04 } diff --git a/mines.neothethird.desktop.in b/mines.neothethird.desktop similarity index 96% rename from mines.neothethird.desktop.in rename to mines.neothethird.desktop index 9911a26..8cc0562 100644 --- a/mines.neothethird.desktop.in +++ b/mines.neothethird.desktop @@ -1,6 +1,6 @@ [Desktop Entry] # TRANSLATORS: Title of application -_Name=Mines +Name=Mines # TRANSLATORS: Single line description of application Comment=Clear the minefield. # TRANSLATORS: Keywords used for finding this application diff --git a/po/mines.neothethird.pot b/po/mines.neothethird.pot index e67396b..01fa801 100644 --- a/po/mines.neothethird.pot +++ b/po/mines.neothethird.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mines.neothethird\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-23 21:06+0000\n" +"POT-Creation-Date: 2024-08-29 17:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgid "Keep existing scores" msgstr "" #. TRANSLATORS: Title of application -#: ../qml/Main.qml:147 ../qml/Main.qml:234 +#: ../qml/Main.qml:147 ../qml/Main.qml:234 mines.neothethird.desktop.in.h:2 msgid "Mines" msgstr ""