From 282043e753e285e94a392c482f716aff21f80b4e Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sun, 29 Oct 2017 14:28:26 -0300 Subject: [PATCH] add build option to enable/install update desktop entry --- .configure-custom.sh | 3 +- CMakeLists.txt | 1 + README.md | 10 +- data/CMakeLists.txt | 3 + data/dbus/CMakeLists.txt | 4 +- data/pamac-updater.desktop | 134 +++++++++++++++++++++++++ meson.build | 6 +- meson_options.txt | 1 + pamac.avprj | 6 +- po/pamac.pot | 2 +- src/CMakeLists.txt | 5 + src/aur/CMakeLists.txt | 5 + src/aur/meson.build | 4 + src/meson.build | 4 + src/pamac-clean-cache/CMakeLists.txt | 5 + src/pamac-clean-cache/meson.build | 4 + src/pamac-install/CMakeLists.txt | 5 + src/pamac-install/meson.build | 4 + src/pamac-manager/CMakeLists.txt | 5 + src/pamac-manager/meson.build | 4 + src/pamac-system-daemon/CMakeLists.txt | 5 + src/pamac-system-daemon/meson.build | 4 + src/pamac-tray/CMakeLists.txt | 5 + src/pamac-tray/meson.build | 4 + src/pamac-user-daemon/CMakeLists.txt | 5 + src/pamac-user-daemon/meson.build | 4 + 26 files changed, 235 insertions(+), 7 deletions(-) create mode 100644 data/pamac-updater.desktop diff --git a/.configure-custom.sh b/.configure-custom.sh index c65be3b..7804029 100644 --- a/.configure-custom.sh +++ b/.configure-custom.sh @@ -1,7 +1,8 @@ #!/bin/bash -ENABLE_VARS="kde-tray|ON|KDE_TRAY" +ENABLE_VARS="kde-tray|ON|KDE_TRAY update-desktop|ON|ENABLE_UPDATE_ICON" ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" +ENABLE_ENABLE_UPDATE_ICON_DOC="install the update desktop entry" DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE" DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing" diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fddb48..ee9a62a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ enable_testing () option(ICON_UPDATE "Update the icon cache after installing" ON) option(BUILD_VALADOC "Build API documentation if Valadoc is available" OFF) option(DISABLE_AUR "DISABLE_AUR" OFF) +option(ENABLE_UPDATE_ICON "ENABLE_UPDATE_ICON" OFF) option(KDE_TRAY "KDE_TRAY" OFF) if( NOT CMAKE_BUILD_TYPE ) diff --git a/README.md b/README.md index bd21370..a189b3e 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ make - -DDISABLE_AUR=ON (to disable AUR in Pamac) - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) +- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) +- -DICON_UPDATE=OFF (to disable updating the icon cache) ## Using CMake with Ninja @@ -66,6 +68,8 @@ ninja - -DDISABLE_AUR=ON (to disable AUR in Pamac) - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) +- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) +- -DICON_UPDATE=OFF (to disable updating the icon cache) ## Using Meson with Ninja @@ -81,6 +85,8 @@ ninja - -DDISABLE_AUR=ON (to disable AUR in Pamac) - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) +- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) +- -DICON_UPDATE=OFF (to disable updating the icon cache) ## Using configure wrapper @@ -96,4 +102,6 @@ make ### Extra configure options - --disable-aur (to disable Aur in Pamac) -- --enable-kde-tray (to build kde tray icon instead of gtk tray icon) \ No newline at end of file +- --enable-kde-tray (to build kde tray icon instead of gtk tray icon) +- --enable-update-desktop (to install the update desktop entry) +- --disable-icon-update (to disable updating the icon cache) \ No newline at end of file diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 55c25cf..aa833b0 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -42,6 +42,9 @@ SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.tr SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h PARENT_SCOPE) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-install.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-manager.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) +if (ENABLE_UPDATE_ICON) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-updater.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) +endif () if (KDE_TRAY) if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-appindicator.desktop DESTINATION /etc/xdg/autostart/ ) diff --git a/data/dbus/CMakeLists.txt b/data/dbus/CMakeLists.txt index 44e9624..eab9070 100644 --- a/data/dbus/CMakeLists.txt +++ b/data/dbus/CMakeLists.txt @@ -6,13 +6,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf DESTINATION - /etc/dbus-1/system.d + /usr/share/dbus-1/system.d ) ELSE() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf DESTINATION - /etc/dbus-1/system.d + /usr/share/dbus-1/system.d ) ENDIF() diff --git a/data/pamac-updater.desktop b/data/pamac-updater.desktop new file mode 100644 index 0000000..1740f9b --- /dev/null +++ b/data/pamac-updater.desktop @@ -0,0 +1,134 @@ +[Desktop Entry] +Name=Software Update +Name[af]=Sagtewarebywerking +Name[ar]=تحديث البرمجيات +Name[as]=চালনাজ্ঞান উন্নয়ন ব্যৱস্থা +Name[ast]=Anovamientu de software +Name[be]=Абнаўленне апраграмавання +Name[bg]=Обновление на софтуера +Name[bn]=সফ্টওয়্যার হালনাগাদ +Name[bn_IN]=সফ্টওয়্যার আপডেট ব্যবস্থা +Name[ca]=Actualització de programari +Name[ca@valencia]=Actualització de programari +Name[cs]=Aktualizace softwaru +Name[da]=Softwareopdatering +Name[de]=Software-Aktualisierungen +Name[el]=Ενημέρωση λογισμικού +Name[en@shaw]=𐑕𐑪𐑓𐑑𐑢𐑺 𐑳𐑐𐑛𐑱𐑑 +Name[en_GB]=Software Update +Name[eo]=Programar-ĝistatigo +Name[es]=Actualización de software +Name[et]=Tarkvarauuendus +Name[eu]=Softwarearen eguneraketa +Name[fa]=بروزرسانی نرم‌افزار +Name[fi]=Ohjelmistopäivitykset +Name[fr]=Mise à jour des logiciels +Name[gl]=Actualización de software +Name[gu]=સોફ્ટવેર સુધારા +Name[he]=עדכון תכנה +Name[hi]=सॉफ्टवेयर अद्यतन +Name[hu]=Szoftverfrissítés +Name[id]=Pembaruan Perangkat Lunak +Name[it]=Aggiornamento software +Name[ja]=ソフトウェアの更新 +Name[kn]=ತಂತ್ರಾಂಶ ಅಪ್‌ಡೇಟ್‌ +Name[ko]=소프트웨어 업데이트 +Name[lt]=Programinės įrangos atnaujinimas +Name[lv]=Programmatūras atjaunināšana +Name[mk]=Ажурирање на софтвер +Name[ml]=സോഫ്റ്റ്‌വെയര്‍ പരിഷ്കാരം +Name[mr]=सॉफ्टवेअर अद्ययावत +Name[nb]=Programvareoppdatering +Name[nl]=Software bijwerken +Name[nn]=Programvareoppdatering +Name[or]=ସଫ୍ଟୱେର ଅଦ୍ୟତନ +Name[pa]=ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ +Name[pl]=Aktualizacja oprogramowania +Name[pt]=Actualização de Software +Name[pt_BR]=Atualizações de programas +Name[ro]=Actualizări de programe +Name[ru]=Обновление программ +Name[sk]=Aktualizácia softvéru +Name[sl]=Posodobitev programske opreme +Name[sr]=Ажурирање програма +Name[sr@latin]=Ažuriranje programa +Name[sv]=Programuppdatering +Name[ta]=மென்பொருள் மேம்படுத்தல் +Name[te]=సాప్ట్‍వేర్ నవీకరణ +Name[th]=ปรับรุ่นซอฟต์แวร์ +Name[tr]=Yazılım Güncelleme +Name[ug]=يۇمشاق دېتال يېڭىلاش +Name[uk]=Оновлення програм +Name[vi]=Bản cập nhật phần mềm +Name[zh_CN]=软件更新 +Name[zh_HK]=軟件更新 +Name[zh_TW]=軟體更新 +Comment=Update software installed on the system +Comment[af]=Werk geïnstalleer sagteware op die stelsel by +Comment[ar]=حدّث الحزم المُثبّتة على النظام +Comment[as]=ব্যৱস্থাপ্ৰণালীত সংস্থাপিত চালনাজ্ঞান উন্নয়ন কৰক +Comment[ast]=Anovar el software instaláu nel sistema +Comment[be]=Абнаўленне апраграмавання, усталяванага ў сістэме +Comment[bg]=Обновяване на софтуера инсталиран върху системата +Comment[bn]=সিস্টেমে ইনস্টলকৃত সফ্টওয়্যার হালনাগাদ +Comment[bn_IN]=সিস্টেমে ইনস্টল থাকা সফ্টওয়্যার আপডেট করুন +Comment[ca]=Actualitza el programari instal·lat en el sistema +Comment[ca@valencia]=Actualitza el programari instal·lat en el sistema +Comment[cs]=Aktualizovat software instalovaný v tomto systému +Comment[da]=Opdatér software installeret på systemet +Comment[de]=Auf dem System installierte Software aktualisieren +Comment[el]=Ενημέρωση εγκατεστημένου λογισμικού +Comment[en@shaw]=𐑳𐑐𐑛𐑱𐑑 𐑕𐑪𐑓𐑑𐑢𐑺 𐑦𐑯𐑕𐑑𐑷𐑤𐑛 𐑪𐑯 𐑞 𐑕𐑦𐑕𐑑𐑩𐑥 +Comment[en_GB]=Update software installed on the system +Comment[es]=Actualizar el software instalado en el sistema +Comment[et]=Süsteemi paigaldatud tarkvara uuendamine +Comment[eu]=Eguneratu sisteman instalatutako softwarea +Comment[fa]=بروزرسانی نرم‌افزار نصب شده بر روی سیستم +Comment[fi]=Päivitä järjestelmään asennettuja ohjelmistoja +Comment[fr]=Met à jour les logiciels installés sur le système +Comment[gl]=Actualizar o software instalado no sistema +Comment[gu]=સિસ્ટમ પર સ્થાપિત થયેલ સોફ્ટવેરને સુધારો +Comment[he]=עדכון תוכנות המותקנות על המערכת +Comment[hi]=सिस्टम पर संस्थापित सॉफ्टवेयर अद्यतन करें +Comment[hu]=A rendszerre telepített szoftverek frissítése +Comment[id]=Mutakhirkan perangkat lunak yang terpasang pada sistem +Comment[it]=Aggiorna il software installato sul sistema +Comment[ja]=システムにインストールされたパッケージの更新 +Comment[kn]=ಗಣಕದಲ್ಲಿ ಅನುಸ್ಥಾಪಿತಗೊಂಡಿರುವ ತಂತ್ರಾಂಶವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡು +Comment[ko]=시스템에 설치한 소프트웨어를 업데이트합니다 +Comment[lt]=Atnaujinti sistemoje įdiegtą programinę įrangą +Comment[lv]=Atjaunināt sistēmā instalēto programmatūru +Comment[mk]=Ажурирај го софтверот инсталирај на системот +Comment[ml]=സിസ്റ്റമില്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന സോഫ്റ്റ്‌വെയറുകള്‍ പരിഷ്കരിക്കുക +Comment[mr]=प्रणालीवर प्रतिष्ठापीत सॉफ्टवेअर अद्ययावत करा +Comment[nb]=Oppdater programvare som er installert på systemet +Comment[nl]=Werk de op uw systeem geïnstalleerde software bij +Comment[nn]=Oppdater programvare installert på systemet +Comment[or]=ତନ୍ତ୍ରରେ ସ୍ଥାପନ କରାଯାଇଥିବା ସଫ୍ଟୱେରକୁ ଅଦ୍ୟତନ କରନ୍ତୁ +Comment[pa]=ਸਿਸਟਮ ਉੱਤੇ ਇੰਸਟਾਲ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕਰੋ +Comment[pl]=Aktualizacja oprogramowania zainstalowanego w systemie +Comment[pt]=Actualizar software instalado no sistema +Comment[pt_BR]=Atualize os programas instalados no sistema +Comment[ro]=Actualizați programele instalate pe sistem +Comment[ru]=Обновление программ, установленных в системе +Comment[sk]=Aktualizuje softvér nainštalovaný v tomto počítači +Comment[sl]=Posodobitev programske opreme nameščene na sistemu +Comment[sr]=Ажурирајте програме инсталиране на овом систему +Comment[sr@latin]=Ažurirajte programe instalirane na ovom sistemu +Comment[sv]=Uppdatera programvara installerade på systemet +Comment[ta]=கணினியில் நிறுவப்பட்ட மென்பொருளை புதுப்பிக்கவும் +Comment[te]=వ్యవస్థ నందు స్థాపించిన సాఫ్ట్‍వేర్‌ను నవీకరించు +Comment[th]=ปรับรุ่นซอฟต์แวร์ที่ติดตั้งอยู่ในระบบ +Comment[tr]=Sisteminizde yüklü yazılımı güncelleyin +Comment[ug]=يېڭىلاش يۇمشاق دېتال بۇ سىستېمىغا ئورنىتىلدى +Comment[uk]=Оновлення програм, встановлених у системі +Comment[vi]=Cập nhật phần mềm đã cài đặt trên hệ thống +Comment[zh_CN]=更新本系统中安装的软件 +Comment[zh_HK]=更新系統中已安裝的軟件 +Comment[zh_TW]=更新系統中已安裝的軟體 +Icon=system-software-update +Exec=pamac-updater +Terminal=false +Type=Application +Categories=GNOME;GTK;System;Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; +StartupNotify=true diff --git a/meson.build b/meson.build index 9e94c5f..3903bdd 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,7 @@ project('pamac',['c','vala']) DISABLE_AUR = (get_option('DISABLE_AUR') != '') +ENABLE_UPDATE_ICON = (get_option('ENABLE_UPDATE_ICON') != '') KDE_TRAY = (get_option('KDE_TRAY') != '') add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c') @@ -24,7 +25,7 @@ gobject_2_0_dep = dependency('gobject-2.0') subdir('po') cfg_dbus_data = configuration_data() cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix')) -meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc/dbus-1/system.d',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.conf')) +meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/dbus-1/system.d',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.conf')) meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-system.service')) @@ -68,6 +69,9 @@ meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts',' install_data('data/pamac-install.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications')) install_data('data/pamac-manager.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications')) +if ENABLE_UPDATE_ICON + install_data('data/pamac-updater.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications')) +endif if KDE_TRAY if (get_option('prefix').startswith('/home/')) message('Autostart file data/pamac-tray-appindicator.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart') diff --git a/meson_options.txt b/meson_options.txt index ee82d80..7ed6feb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,3 @@ option('DISABLE_AUR',type : 'string', value: '') +option('ENABLE_UPDATE_ICON',type : 'string', value: '') option('KDE_TRAY',type : 'string', value: '') diff --git a/pamac.avprj b/pamac.avprj index d745c88..4eba252 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -3,7 +3,7 @@ autovala_version: 26 project_name: pamac vala_version: 0.38 -custom: data/dbus/org.pamac.system.conf /etc/dbus-1/system.d +custom: data/dbus/org.pamac.system.conf /usr/share/dbus-1/system.d custom: data/systemd/pamac-system.service /usr/lib/systemd/system custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system @@ -17,6 +17,7 @@ else custom: data/config/pamac.conf /etc end +define: ENABLE_UPDATE_ICON define: KDE_TRAY *define: DISABLE_AUR @@ -212,6 +213,9 @@ end *desktop: data/pamac-install.desktop *desktop: data/pamac-manager.desktop +if ENABLE_UPDATE_ICON +desktop: data/pamac-updater.desktop +end if KDE_TRAY autostart: data/pamac-tray-appindicator.desktop diff --git a/po/pamac.pot b/po/pamac.pot index eac6ef9..059b795 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: cromer@cromnix.org\n" -"POT-Creation-Date: 2017-10-29 12:13-0300\n" +"POT-Creation-Date: 2017-10-29 14:28-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 84b4db7..5907870 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -52,6 +52,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/aur/CMakeLists.txt b/src/aur/CMakeLists.txt index e7fa5bd..3ac773a 100644 --- a/src/aur/CMakeLists.txt +++ b/src/aur/CMakeLists.txt @@ -36,6 +36,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/aur/meson.build b/src/aur/meson.build index 0ccd9b0..6918b36 100644 --- a/src/aur/meson.build +++ b/src/aur/meson.build @@ -20,6 +20,10 @@ if DISABLE_AUR aur_vala_args += ['-D', 'DISABLE_AUR'] aur_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + aur_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + aur_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY aur_vala_args += ['-D', 'KDE_TRAY'] aur_c_args += ['-DKDE_TRAY'] diff --git a/src/meson.build b/src/meson.build index 11fd0ac..f1a1d0b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -38,6 +38,10 @@ if DISABLE_AUR pamac_vala_args += ['-D', 'DISABLE_AUR'] pamac_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_vala_args += ['-D', 'KDE_TRAY'] pamac_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 7fc7d5f..72eeb57 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -40,6 +40,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index b0b1247..f498e56 100644 --- a/src/pamac-clean-cache/meson.build +++ b/src/pamac-clean-cache/meson.build @@ -24,6 +24,10 @@ if DISABLE_AUR pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR'] pamac_clean_cache_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_clean_cache_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_clean_cache_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_clean_cache_vala_args += ['-D', 'KDE_TRAY'] pamac_clean_cache_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index 54cff51..4591f9b 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -39,6 +39,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index 110db04..b75b67d 100644 --- a/src/pamac-install/meson.build +++ b/src/pamac-install/meson.build @@ -25,6 +25,10 @@ if DISABLE_AUR pamac_install_vala_args += ['-D', 'DISABLE_AUR'] pamac_install_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_install_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_install_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_install_vala_args += ['-D', 'KDE_TRAY'] pamac_install_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index 1b27494..7319f40 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -40,6 +40,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index 583f2c8..e7c3c2d 100644 --- a/src/pamac-manager/meson.build +++ b/src/pamac-manager/meson.build @@ -26,6 +26,10 @@ if DISABLE_AUR pamac_manager_vala_args += ['-D', 'DISABLE_AUR'] pamac_manager_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_manager_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_manager_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_manager_vala_args += ['-D', 'KDE_TRAY'] pamac_manager_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 1836fc5..47715f8 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -50,6 +50,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index c03ae7c..cb68890 100644 --- a/src/pamac-system-daemon/meson.build +++ b/src/pamac-system-daemon/meson.build @@ -34,6 +34,10 @@ if DISABLE_AUR pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR'] pamac_system_daemon_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_system_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_system_daemon_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_system_daemon_vala_args += ['-D', 'KDE_TRAY'] pamac_system_daemon_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index 3c777c1..2f4678d 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -56,6 +56,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index 5c94c39..2b13a9f 100644 --- a/src/pamac-tray/meson.build +++ b/src/pamac-tray/meson.build @@ -40,6 +40,10 @@ if DISABLE_AUR pamac_tray_vala_args += ['-D', 'DISABLE_AUR'] pamac_tray_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_tray_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_tray_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_tray_vala_args += ['-D', 'KDE_TRAY'] pamac_tray_c_args += ['-DKDE_TRAY'] diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index da2b512..607f734 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -46,6 +46,11 @@ if (DISABLE_AUR) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) endif () +if (ENABLE_UPDATE_ICON) + set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) +endif () if (KDE_TRAY) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index 38b26a3..b95ecfd 100644 --- a/src/pamac-user-daemon/meson.build +++ b/src/pamac-user-daemon/meson.build @@ -30,6 +30,10 @@ if DISABLE_AUR pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR'] pamac_user_daemon_c_args += ['-DDISABLE_AUR'] endif +if ENABLE_UPDATE_ICON + pamac_user_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_user_daemon_c_args += ['-DENABLE_UPDATE_ICON'] +endif if KDE_TRAY pamac_user_daemon_vala_args += ['-D', 'KDE_TRAY'] pamac_user_daemon_c_args += ['-DKDE_TRAY']