update to 6.1.0

.configure-custom.sh

@@ -2,5 +2,6 @@
 
 ENABLE_VARS="kde-tray|ON|KDE_TRAY"
 ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
-DISABLE_VARS="aur|ON|DISABLE_AUR"
+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"

CMakeLists.txt

@@ -76,6 +76,7 @@ add_subdirectory(src)
 add_subdirectory(src/aur)
 add_subdirectory(src/pamac-user-daemon)
 add_subdirectory(src/pamac-tray)
+add_subdirectory(src/pamac-clean-cache)
 add_subdirectory(src/pamac-install)
 add_subdirectory(src/pamac-manager)
 add_subdirectory(src/pamac-system-daemon)

README.md

@@ -20,7 +20,7 @@ A graphical package manager for pacman
 
 - GTK+: 3.0
 - GIO: 2.0
-- GLib: 2.0
+- GLib: 2.38
 - GObject: 2.0
 - Json-Glib: 1.0
 - libalpm
@@ -31,8 +31,8 @@ A graphical package manager for pacman
 - vte: 2.91
 - appindicator-gtk3 (optional to build KDE tray icon)
 - CMake
-- Vala
-- AutoVala (optional to regenerate CMake files)
+- Vala: 0.38
+- AutoVala: 1.1.1 (optional to regenerate CMake files)
 
 ## Using CMake
 

autovala/configure-custom.sh

@@ -2,5 +2,6 @@
 
 ENABLE_VARS="kde-tray|ON|KDE_TRAY"
 ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
-DISABLE_VARS="aur|ON|DISABLE_AUR"
+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"

data/CMakeLists.txt

@@ -71,7 +71,6 @@ SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.tr
 endif ()
 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/ )
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-updater.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
 if (KDE_TRAY)
 	if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) )
 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-appindicator.desktop DESTINATION /etc/xdg/autostart/ )

data/config/noaur/pamac.conf

@@ -9,3 +9,9 @@ RefreshPeriod = 6
 
 ## When there are no updates available, hide the tray icon:
 #NoUpdateHideIcon
+
+## Number of versions of each package to keep in the cache:
+KeepNumPackages = 3
+
+## Remove only the versions of uninstalled packages when clean cache:
+#OnlyRmUninstalled

data/config/pamac.conf

@@ -24,3 +24,9 @@ BuildDirectory = /tmp
 
 ## Do not ask for confirmation when building packages:
 #NoConfirmBuild
+
+## Number of versions of each package to keep in the cache:
+KeepNumPackages = 3
+
+## Remove only the versions of uninstalled packages when clean cache:
+#OnlyRmUninstalled

data/pamac-tray-appindicator.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Update Notifier Appindicator
 Icon=update-notifier
-Exec=pamac-tray-appindicator
+Exec=pamac-tray
 Terminal=false
 Type=Application
 StartupNotify=true

data/pamac-updater.desktop

@@ -1,134 +0,0 @@
-[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

data/systemd/pamac-cleancache.service

@@ -3,4 +3,4 @@ Description=Clean packages cache
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/paccache -r
+ExecStart=/usr/bin/pamac-clean-cache

pamac.avprj

@@ -1,7 +1,7 @@
 ### AutoVala Project ###
 autovala_version: 24
 project_name: pamac
-*vala_version: 0.38
+vala_version: 0.38
 
 custom: data/dbus/org.pamac.system.conf ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
 custom: data/dbus/org.pamac.user.service ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services
@@ -33,8 +33,19 @@ end
 
 vapidir: src/vapis
 
+vala_binary: src/pamac-clean-cache/pamac-clean-cache
+version: 6.1.0
+vala_local_package: Pamac
+vala_package: posix
+vala_check_package: gtk+-3.0
+*vala_check_package: gio-2.0
+*vala_check_package: glib-2.0
+*vala_check_package: gobject-2.0
+*vala_source: clean_cache.vala
+*vala_source: pamac_config.vala
+
 vala_binary: src/pamac-install/pamac-install
-version: 6.0.0
+version: 6.1.0
 use_gresource: pamac_installer_gresource_xml
 vala_local_package: Pamac
 vala_check_package: gtk+-3.0
@@ -45,7 +56,7 @@ vala_check_package: gtk+-3.0
 *vala_source: progress_dialog.vala
 
 vala_binary: src/pamac-manager/pamac-manager
-version: 6.0.0
+version: 6.1.0
 use_gresource: pamac_manager_gresource_xml
 vala_local_package: Pamac
 vala_check_package: gtk+-3.0
@@ -57,7 +68,7 @@ vala_check_package: gtk+-3.0
 *vala_source: manager_window.vala
 
 vala_binary: src/pamac-system-daemon/pamac-system-daemon
-version: 6.0.0
+version: 6.1.0
 vala_local_package: Pamac
 if NOT DISABLE_AUR
 vala_local_package: AUR
@@ -78,7 +89,7 @@ vala_check_package: polkit-gobject-1
 *vala_source: system_daemon.vala
 
 vala_binary: src/pamac-tray/pamac-tray
-version: 6.0.0
+version: 6.1.0
 vala_local_package: Pamac
 if NOT DISABLE_AUR
 vala_local_package: AUR
@@ -104,9 +115,11 @@ end
 *vala_source: user_daemon.vala
 
 vala_binary: src/pamac-user-daemon/pamac-user-daemon
-version: 6.0.0
-vala_local_package: AUR
+version: 6.1.0
 vala_local_package: Pamac
+if NOT DISABLE_AUR
+vala_local_package: AUR
+end
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
@@ -120,7 +133,7 @@ vala_check_package: libsoup-2.4
 
 
 vala_library: src/pamac
-version: 6.0.0
+version: 6.1.0
 *namespace: Pamac
 use_gresource: pamac_transaction_gresource_xml
 vala_package: posix
@@ -132,6 +145,7 @@ vala_check_package: vte-2.91
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
+*c_library: m
 *vala_source: alpm_config.vala
 *vala_source: choose_ignorepkgs_dialog.vala
 *vala_source: choose_provider_dialog.vala
@@ -145,7 +159,7 @@ vala_check_package: vte-2.91
 *vala_source: transaction_sum_dialog.vala
 
 vala_library: src/aur/aur
-version: 6.0.0
+version: 6.1.0
 *namespace: AUR
 vala_check_package: json-glib-1.0
 vala_check_package: libsoup-2.4
@@ -168,6 +182,8 @@ vala_check_package: libsoup-2.4
 *translate: vala src/common.vala
 *translate: vala src/mirrors_config.vala
 *translate: vala src/package.vala
+*translate: vala src/pamac-clean-cache/clean_cache.vala
+*translate: vala src/pamac-clean-cache/pamac_config.vala
 *translate: vala src/pamac-install/installer.vala
 *translate: vala src/pamac-install/progress_dialog.vala
 *translate: vala src/pamac-manager/history_dialog.vala
@@ -204,7 +220,6 @@ end
 
 *desktop: data/pamac-install.desktop
 *desktop: data/pamac-manager.desktop
-*desktop: data/pamac-updater.desktop
 
 if KDE_TRAY
 autostart: data/pamac-tray-appindicator.desktop
@@ -241,9 +256,5 @@ end
 *pixmap: data/pixmaps/package-upgrade.png
 
 # These depends are needed to enable parallel builds
-include: src/pamac-install/CMakeDepends.txt
 include: src/pamac-manager/CMakeDepends.txt
-include: src/pamac-system-daemon/CMakeDepends.txt
-include: src/pamac-tray/CMakeDepends.txt
-include: src/pamac-user-daemon/CMakeDepends.txt
 

po/CMakeLists.txt

@@ -3,4 +3,4 @@
 
 include (Translations)
 add_translations_directory("pamac")
-add_translations_catalog("pamac" ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../src/aur ../data/interface )
+add_translations_catalog("pamac" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../src/aur ../data/interface )

po/POTFILES.in

@@ -1,3 +1,5 @@
+src/pamac-clean-cache/clean_cache.vala
+src/pamac-clean-cache/pamac_config.vala
 src/pamac-install/installer.vala
 src/pamac-install/progress_dialog.vala
 src/pamac-manager/history_dialog.vala

src/CMakeLists.txt

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.pc ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps)
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 link_libraries ( ${DEPS_LIBRARIES} )
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -83,9 +83,10 @@ SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE})
 add_library(Pamac SHARED ${VALA_C})
 
 add_dependencies (Pamac pamac_transaction_gresource_xml)
+target_link_libraries( Pamac m )
 set_target_properties( Pamac PROPERTIES
 VERSION
-	6.0.0
+	6.1.0
 SOVERSION
 	6 )
 

src/Pamac.pc

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
 
 Name: Pamac
 Description: Pamac
-Version: 6.0.0
+Version: 6.1.0
 Libs: -L@DOLLAR@{libdir} -lPamac
 Cflags: -I@DOLLAR@{includedir}
 Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0

src/aur/AUR.pc

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
 
 Name: AUR
 Description: AUR
-Version: 6.0.0
+Version: 6.1.0
 Libs: -L@DOLLAR@{libdir} -lAUR
 Cflags: -I@DOLLAR@{includedir}
 Requires: json-glib-1.0 libsoup-2.4 glib-2.0

src/aur/CMakeLists.txt

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR}
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps)
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 link_libraries ( ${DEPS_LIBRARIES} )
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -65,7 +65,7 @@ add_library(AUR SHARED ${VALA_C})
 
 set_target_properties( AUR PROPERTIES
 VERSION
-	6.0.0
+	6.1.0
 SOVERSION
 	6 )
 

src/pamac-clean-cache/CMakeLists.txt

@@ -0,0 +1,89 @@
+### CMakeLists automatically created with AutoVala
+### Do not edit
+
+set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
+set (PKGDATADIR "${DATADIR}/pamac")
+set (GETTEXT_PACKAGE "pamac")
+set (RELEASE_NAME "pamac")
+set (CMAKE_C_FLAGS "")
+set (PREFIX ${CMAKE_INSTALL_PREFIX})
+set (VERSION "6.1.0")
+set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
+set (DOLLAR "$")
+
+configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
+add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+set (VERSION "6.1.0")
+add_definitions (${DEPS_CFLAGS})
+include_directories ( ${CMAKE_BINARY_DIR}/src )
+link_libraries ( ${DEPS_LIBRARIES} -lPamac )
+link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.38" MINIMUM)
+include (ValaPrecompile)
+
+set (VALA_PACKAGES ${VALA_PACKAGES} posix)
+set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
+set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
+
+set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
+set (APP_SOURCES ${APP_SOURCES} clean_cache.vala)
+set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
+
+set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
+
+if (DISABLE_AUR)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
+endif ()
+if (KDE_TRAY)
+	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
+endif ()
+set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
+
+if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
+	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
+endif()
+
+
+vala_precompile(VALA_C pamac-clean-cache
+	${APP_SOURCES}
+PACKAGES
+	${VALA_PACKAGES}
+CUSTOM_VAPIS
+	${CUSTOM_VAPIS_LIST}
+OPTIONS
+	${COMPILE_OPTIONS}
+)
+
+add_executable(pamac-clean-cache ${VALA_C})
+set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} Pamac )
+add_dependencies( pamac-clean-cache ${pamac-clean-cache_DEPENDENCIES} )
+
+
+install(TARGETS
+	pamac-clean-cache
+RUNTIME DESTINATION
+	${CMAKE_INSTALL_BINDIR}
+)
+if(HAVE_VALADOC)
+	valadoc(pamac-clean-cache
+		${CMAKE_BINARY_DIR}/valadoc/pamac-clean-cache
+		${APP_SOURCES}
+	PACKAGES
+		${VALA_PACKAGES}
+	CUSTOM_VAPIS
+		${CUSTOM_VAPIS_LIST}
+	)
+	install(DIRECTORY
+		${CMAKE_BINARY_DIR}/valadoc
+	DESTINATION
+		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
+	)
+endif()

src/pamac-clean-cache/Config.vala.base

@@ -0,0 +1,10 @@
+namespace Constants {
+	public const string DATADIR = "@DATADIR@";
+	public const string PKGDATADIR = "@PKGDATADIR@";
+	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+	public const string RELEASE_NAME = "@RELEASE_NAME@";
+	public const string VERSION = "@VERSION@";
+#if UNITEST
+	public const string TESTSRCDIR = "@TESTSRCDIR@";
+#endif
+}

src/pamac-clean-cache/clean_cache.vala

@@ -0,0 +1,33 @@
+/*
+ *  pamac-vala
+ *
+ *  Copyright (C) 2017 Chris Cromer <cromer@cromnix.org>
+ *  Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a get of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int main () {
+	var pamac_config = new Pamac.Config ("/etc/pamac.conf");
+	string rm_only_uninstalled_str = "";
+	if (pamac_config.rm_only_uninstalled) {
+		rm_only_uninstalled_str = "-u";
+	}
+	try {
+		Process.spawn_command_line_sync ("paccache -q --nocolor %s -r -k %llu".printf (rm_only_uninstalled_str, pamac_config.keep_num_pkgs));
+	} catch (SpawnError e) {
+		stderr.printf ("SpawnError: %s\n", e.message);
+	}
+	return 0;
+}

src/pamac-clean-cache/pamac_config.vala

@@ -0,0 +1 @@
+../pamac_config.vala

src/pamac-install/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac )
@@ -65,6 +65,8 @@ OPTIONS
 SET (VALA_C ${VALA_C} ${pamac_installer_gresource_xml_C_FILE})
 add_executable(pamac-install ${VALA_C})
 add_dependencies (pamac-install pamac_installer_gresource_xml)
+set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} Pamac )
+add_dependencies( pamac-install ${pamac-install_DEPENDENCIES} )
 
 
 install(TARGETS
@@ -87,4 +89,3 @@ if(HAVE_VALADOC)
 		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
 	)
 endif()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt)

src/pamac-manager/CMakeDepends.txt

@@ -1,3 +1,2 @@
-add_dependencies(pamac-manager Pamac)
 include (InstallSymlink)
 install_symlink(pamac-manager ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/pamac-updater)

src/pamac-manager/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac )
@@ -67,6 +67,8 @@ OPTIONS
 SET (VALA_C ${VALA_C} ${pamac_manager_gresource_xml_C_FILE})
 add_executable(pamac-manager ${VALA_C})
 add_dependencies (pamac-manager pamac_manager_gresource_xml)
+set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} Pamac )
+add_dependencies( pamac-manager ${pamac-manager_DEPENDENCIES} )
 
 
 install(TARGETS

src/pamac-system-daemon/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
@@ -73,6 +73,11 @@ OPTIONS
 )
 
 add_executable(pamac-system-daemon ${VALA_C})
+set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} Pamac )
+if (NOT DISABLE_AUR)
+	set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} AUR )
+endif ()
+add_dependencies( pamac-system-daemon ${pamac-system-daemon_DEPENDENCIES} )
 
 
 install(TARGETS
@@ -95,4 +100,3 @@ if(HAVE_VALADOC)
 		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
 	)
 endif()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt)

src/pamac-system-daemon/pamac_config.vala

@@ -26,10 +26,15 @@ namespace Pamac {
 		public bool recurse { get; private set; }
 		public uint64 refresh_period { get; private set; }
 		public bool no_update_hide_icon { get; private set; }
+#if DISABLE_AUR
+#else
 		public bool enable_aur { get; private set; }
 		public bool search_aur { get; private set; }
 		public string aur_build_dir { get; private set; }
 		public bool check_aur_updates { get; private set; }
+#endif
+		public uint64 keep_num_pkgs { get; private set; }
+		public bool rm_only_uninstalled { get; private set; }
 		public unowned HashTable<string,string> environment_variables {
 			get {
 				return _environment_variables;
@@ -71,10 +76,15 @@ namespace Pamac {
 			// set default options
 			recurse = false;
 			no_update_hide_icon = false;
+#if DISABLE_AUR
+#else
 			enable_aur = false;
 			search_aur = false;
 			aur_build_dir = "/tmp";
 			check_aur_updates = false;
+#endif
+			keep_num_pkgs = 3;
+			rm_only_uninstalled = false;
 			parse_file (conf_path);
 		}
 
@@ -108,6 +118,8 @@ namespace Pamac {
 							}
 						} else if (key == "NoUpdateHideIcon") {
 							no_update_hide_icon = true;
+#if DISABLE_AUR
+#else
 						} else if (key == "EnableAUR") {
 							enable_aur = true;
 						} else if (key == "SearchInAURByDefault") {
@@ -118,6 +130,14 @@ namespace Pamac {
 							}
 						} else if (key == "CheckAURUpdates") {
 							check_aur_updates = true;
+#endif
+						} else if (key == "KeepNumPackages") {
+							if (splitted.length == 2) {
+								unowned string val = splitted[1]._strip ();
+								keep_num_pkgs = uint64.parse (val);
+							}
+						} else if (key == "OnlyRmUninstalled") {
+							rm_only_uninstalled = true;
 						}
 					}
 				} catch (GLib.Error e) {
@@ -173,6 +193,8 @@ namespace Pamac {
 							} else {
 								data.append (line + "\n");
 							}
+#if DISABLE_AUR
+#else
 						} else if (line.contains ("EnableAUR")) {
 							if (new_conf.lookup_extended ("EnableAUR", null, out variant)) {
 								if (variant.get_boolean ()) {
@@ -213,6 +235,25 @@ namespace Pamac {
 							} else {
 								data.append (line + "\n");
 							}
+#endif
+						} else if (line.contains ("KeepNumPackages")) {
+							if (new_conf.lookup_extended ("KeepNumPackages", null, out variant)) {
+								data.append ("KeepNumPackages = %llu\n".printf (variant.get_uint64 ()));
+								new_conf.remove ("KeepNumPackages");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("OnlyRmUninstalled")) {
+							if (new_conf.lookup_extended ("OnlyRmUninstalled", null, out variant)) {
+								if (variant.get_boolean ()) {
+									data.append ("OnlyRmUninstalled\n");
+								} else {
+									data.append ("#OnlyRmUninstalled\n");
+								}
+								new_conf.remove ("OnlyRmUninstalled");
+							} else {
+								data.append (line + "\n");
+							}
 						} else {
 							data.append (line + "\n");
 						}
@@ -246,6 +287,8 @@ namespace Pamac {
 						} else {
 							data.append ("#NoUpdateHideIcon\n");
 						}
+#if DISABLE_AUR
+#else
 					} else if (key == "EnableAUR") {
 						if (val.get_boolean ()) {
 							data.append ("EnableAUR\n");
@@ -266,6 +309,15 @@ namespace Pamac {
 						} else {
 							data.append ("#CheckAURUpdates\n");
 						}
+#endif
+					} else if (key == "KeepNumPackages") {
+						data.append ("KeepNumPackages = %llu\n".printf (val.get_uint64 ()));
+					} else if (key == "OnlyRmUninstalled") {
+						if (val.get_boolean ()) {
+							data.append ("OnlyRmUninstalled\n");
+						} else {
+							data.append ("#OnlyRmUninstalled\n");
+						}
 					}
 				}
 			}

src/pamac-system-daemon/system_daemon.vala

@@ -427,12 +427,12 @@ namespace Pamac {
 			});
 		}
 
-		public void clean_cache (uint keep_nb, bool only_uninstalled, GLib.BusName sender) {
+		public void clean_cache (uint64 keep_nb, bool only_uninstalled, GLib.BusName sender) {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized) {
-					string[] commands = {"paccache", "-rq"};
-					commands += "-k%u".printf (keep_nb);
+					string[] commands = {"paccache", "--nocolor", "-rq"};
+					commands += "-k%llu".printf (keep_nb);
 					if (only_uninstalled) {
 						commands += "-u";
 					}

src/pamac-tray/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
@@ -78,6 +78,11 @@ OPTIONS
 )
 
 add_executable(pamac-tray ${VALA_C})
+set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} Pamac )
+if (NOT DISABLE_AUR)
+	set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} AUR )
+endif ()
+add_dependencies( pamac-tray ${pamac-tray_DEPENDENCIES} )
 
 
 install(TARGETS
@@ -103,4 +108,3 @@ endif()
 if (KDE_TRAY)
 	else ()
 endif ()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt)

src/pamac-user-daemon/CMakeLists.txt

@@ -7,17 +7,17 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
 set (DOLLAR "$")
 
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
-set (VERSION "6.0.0")
+set (VERSION "6.1.0")
 add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src )
+include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
+link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )
+link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 find_package (Vala REQUIRED)
 include (ValaVersion)
 ensure_vala_version ("0.38" MINIMUM)
@@ -36,8 +36,10 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
 set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
 set (APP_SOURCES ${APP_SOURCES} user_daemon.vala)
 
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi)
 set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi)
+if (NOT DISABLE_AUR)
+	set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi)
+endif ()
 
 if (DISABLE_AUR)
 	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
@@ -67,6 +69,11 @@ OPTIONS
 )
 
 add_executable(pamac-user-daemon ${VALA_C})
+set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} Pamac )
+if (NOT DISABLE_AUR)
+	set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} AUR )
+endif ()
+add_dependencies( pamac-user-daemon ${pamac-user-daemon_DEPENDENCIES} )
 
 
 install(TARGETS
@@ -89,4 +96,3 @@ if(HAVE_VALADOC)
 		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
 	)
 endif()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt)

src/pamac_config.vala

@@ -33,6 +33,8 @@ namespace Pamac {
 		public string aur_build_dir { get; private set; }
 		public bool check_aur_updates { get; private set; }
 #endif
+		public uint64 keep_num_pkgs { get; private set; }
+		public bool rm_only_uninstalled { get; private set; }
 		public unowned HashTable<string,string> environment_variables {
 			get {
 				return _environment_variables;
@@ -81,6 +83,8 @@ namespace Pamac {
 			aur_build_dir = "/tmp";
 			check_aur_updates = false;
 #endif
+			keep_num_pkgs = 3;
+			rm_only_uninstalled = false;
 			parse_file (conf_path);
 		}
 
@@ -127,6 +131,13 @@ namespace Pamac {
 						} else if (key == "CheckAURUpdates") {
 							check_aur_updates = true;
 #endif
+						} else if (key == "KeepNumPackages") {
+							if (splitted.length == 2) {
+								unowned string val = splitted[1]._strip ();
+								keep_num_pkgs = uint64.parse (val);
+							}
+						} else if (key == "OnlyRmUninstalled") {
+							rm_only_uninstalled = true;
 						}
 					}
 				} catch (GLib.Error e) {

src/preferences_dialog.vala

@@ -103,6 +103,8 @@ namespace Pamac {
 				previous_refresh_period = transaction.refresh_period;
 			}
 			no_update_hide_icon_checkbutton.active = transaction.no_update_hide_icon;
+			cache_keep_nb_spin_button.value = transaction.keep_num_pkgs;
+			cache_only_uninstalled_checkbutton.active = transaction.rm_only_uninstalled;
 
 			// populate ignorepkgs_liststore
 			ignorepkgs_liststore = new Gtk.ListStore (1, typeof (string));
@@ -116,6 +118,8 @@ namespace Pamac {
 			check_updates_button.state_set.connect (on_check_updates_button_state_set);
 			refresh_period_spin_button.value_changed.connect (on_refresh_period_spin_button_value_changed);
 			no_update_hide_icon_checkbutton.toggled.connect (on_no_update_hide_icon_checkbutton_toggled);
+			cache_keep_nb_spin_button.value_changed.connect (on_cache_keep_nb_spin_button_value_changed);
+			cache_only_uninstalled_checkbutton.toggled.connect (on_cache_only_uninstalled_checkbutton_toggled);
 			transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished);
 
 			AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
@@ -197,6 +201,19 @@ namespace Pamac {
 			transaction.start_write_pamac_config (new_pamac_conf);
 		}
 
+
+		void on_cache_keep_nb_spin_button_value_changed () {
+			var new_pamac_conf = new HashTable<string,Variant> (str_hash, str_equal);
+			new_pamac_conf.insert ("KeepNumPackages", new Variant.uint64 (cache_keep_nb_spin_button.get_value_as_int ()));
+			transaction.start_write_pamac_config (new_pamac_conf);
+		}
+
+		void on_cache_only_uninstalled_checkbutton_toggled () {
+			var new_pamac_conf = new HashTable<string,Variant> (str_hash, str_equal);
+			new_pamac_conf.insert ("OnlyRmUninstalled", new Variant.boolean (cache_only_uninstalled_checkbutton.active));
+			transaction.start_write_pamac_config (new_pamac_conf);
+}
+
 		void on_no_update_hide_icon_checkbutton_toggled () {
 			var new_pamac_conf = new HashTable<string,Variant> (str_hash, str_equal);
 			new_pamac_conf.insert ("NoUpdateHideIcon", new Variant.boolean (no_update_hide_icon_checkbutton.active));
@@ -399,8 +416,7 @@ namespace Pamac {
 
 		[GtkCallback]
 		void on_cache_clean_button_clicked () {
-			transaction.clean_cache ((uint) cache_keep_nb_spin_button.get_value_as_int (),
-									cache_only_uninstalled_checkbutton.active);
+			transaction.clean_cache (transaction.keep_num_pkgs, transaction.rm_only_uninstalled);
 		}
 	}
 }

src/transaction.vala

@@ -18,6 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+//using Math
+
 namespace Pamac {
 	[DBus (name = "org.pamac.user")]
 	interface UserDaemon : Object {
@@ -72,7 +74,7 @@ namespace Pamac {
 		public abstract void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) throws IOError;
 		public abstract void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) throws IOError;
 		public abstract void start_generate_mirrors_list () throws IOError;
-		public abstract void clean_cache (uint keep_nb, bool only_uninstalled) throws IOError;
+		public abstract void clean_cache (uint64 keep_nb, bool only_uninstalled) throws IOError;
 		public abstract void start_set_pkgreason (string pkgname, uint reason) throws IOError;
 		public abstract void start_refresh (bool force) throws IOError;
 		public abstract void start_sysupgrade_prepare (bool enable_downgrade, string[] temporary_ignorepkgs) throws IOError;
@@ -142,6 +144,8 @@ namespace Pamac {
 		public bool search_aur { get { return pamac_config.search_aur; } }
 		public string aur_build_dir { get { return pamac_config.aur_build_dir; } }
 #endif
+		public uint64 keep_num_pkgs { get { return pamac_config.keep_num_pkgs; } }
+		public bool rm_only_uninstalled { get { return pamac_config.rm_only_uninstalled; } }
 		public unowned GLib.HashTable<string,string> environment_variables { get {return pamac_config.environment_variables; } }
 		public bool no_update_hide_icon { get { return pamac_config.no_update_hide_icon; } }
 		public bool recurse { get { return pamac_config.recurse; } }
@@ -503,7 +507,7 @@ namespace Pamac {
 			}
 		}
 
-		public void clean_cache (uint keep_nb, bool only_uninstalled) {
+		public void clean_cache (uint64 keep_nb, bool only_uninstalled) {
 			try {
 				system_daemon.clean_cache (keep_nb, only_uninstalled);
 			} catch (IOError e) {