fix terminal color not updating

.gitignore

@@ -5,3 +5,4 @@ PKGBUILD
 *.pkg.tar.xz
 *.pkg.tar.xz.sig
 /build
+src/interface/*~

README.md

@@ -32,9 +32,9 @@ A graphical package manager for pacman
 - appindicator-gtk3 (optional to build KDE tray icon)
 - CMake
 - Vala: 0.38
-- AutoVala: 1.1.1 (optional to regenerate CMake files)
+- AutoVala: 1.1.2 (optional to regenerate CMake and Meson files)
 
-## Using CMake
+## Using CMake with GNU Make
 
 ```
 mkdir build
@@ -48,11 +48,43 @@ make
 ### Extra build flags
 
 - -DDISABLE_AUR=ON (to disable AUR in Pamac)
-- -DKDE_TRAY=true (to build kde tray icon instead of gtk tray icon)
+- -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
 
-## Using configure
+## Using CMake with Ninja
 
-The configure script is just a wrapper for CMake, in the background the build process is the same.
+```
+mkdir build
+cd build
+cmake .. \
+    -GNinja
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ninja
+```
+### Extra build flags
+
+- -DDISABLE_AUR=ON (to disable AUR in Pamac)
+- -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
+
+## Using Meson with Ninja
+
+```
+mkdir build
+cd build
+meson \
+    --prefix=/usr \
+    --sysconfdir=/etc
+ninja
+```
+### Extra build flags
+
+- -DDISABLE_AUR=ON (to disable AUR in Pamac)
+- -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
+
+## Using configure wrapper
+
+The configure script is just a wrapper for CMake, in the background the build process is the same as using CMake with GNU Make.
 
 ```
 ./configure --prefix=/usr \

autogen.sh

@@ -8,7 +8,6 @@ popd
 
 # Update the autovala environment
 export AUTOVALA_CMAKE_SCRIPT="${PWD}"/autovala/cmake
-autovala refresh
+autovala update
-autovala cmake
 cp "${PWD}"/autovala/configure "${PWD}"/configure
 cp "${PWD}"/autovala/configure-custom.sh "${PWD}"/.configure-custom.sh

data/config/CMakeLists.txt

@@ -6,13 +6,13 @@ if (NOT(DISABLE_AUR))
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}
+		/etc
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}
+		/etc
 	)
 ENDIF()
 

data/config/noaur/CMakeLists.txt

@@ -6,13 +6,13 @@ if (DISABLE_AUR)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}
+		/etc
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}
+		/etc
 	)
 ENDIF()
 

data/config/noaur/pamac.conf

@@ -15,3 +15,9 @@ KeepNumPackages = 3
 
 ## Remove only the versions of uninstalled packages when clean cache:
 #OnlyRmUninstalled
+
+## Terminal background color
+BackgroundColor = rgb(0,0,0)
+
+## Terminal foreground color
+ForegroundColor = rgb(255,255,255)

data/config/pamac.conf

@@ -30,3 +30,9 @@ KeepNumPackages = 3
 
 ## Remove only the versions of uninstalled packages when clean cache:
 #OnlyRmUninstalled
+
+## Terminal background color
+BackgroundColor = rgb(0,0,0)
+
+## Terminal foreground color
+ForegroundColor = rgb(255,255,255)

data/dbus/CMakeLists.txt

@@ -5,13 +5,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
+		/etc/dbus-1/system.d
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf
 	DESTINATION
-		${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
+		/etc/dbus-1/system.d
 	)
 ENDIF()
 
@@ -19,13 +19,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services
+		/usr/share/dbus-1/services
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services
+		/usr/share/dbus-1/services
 	)
 ENDIF()
 
@@ -33,13 +33,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services
+		/usr/share/dbus-1/system-services
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services
+		/usr/share/dbus-1/system-services
 	)
 ENDIF()
 

data/interface/preferences_dialog.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.1 -->
 <interface>
   <requires lib="gtk+" version="3.14"/>
   <object class="GtkAdjustment" id="cache_keep_nb_adjustment">
@@ -375,6 +375,102 @@
                 <property name="title" translatable="yes">General</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="terminal_config_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">6</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkColorButton" id="terminal_background">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a background color</property>
+                        <property name="rgba">rgb(0,0,0)</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkColorButton" id="terminal_foreground">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a text color</property>
+                        <property name="rgba">rgb(255,255,255)</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Background:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Text:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="name">terminal</property>
+                <property name="title" translatable="yes">Terminal</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox" id="mirrors_config_box">
                 <property name="visible">True</property>
@@ -487,7 +583,7 @@
               <packing>
                 <property name="name">official_repositories</property>
                 <property name="title" translatable="yes">Official Repositories</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -620,6 +716,24 @@ All AUR users should be familiar with the build process.</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="check_aur_updates_checkbutton">
+                    <property name="label" translatable="yes">Check for updates from AUR</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">24</property>
+                    <property name="margin_start">24</property>
+                    <property name="hexpand">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
@@ -662,29 +776,11 @@ All AUR users should be familiar with the build process.</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="check_aur_updates_checkbutton">
-                    <property name="label" translatable="yes">Check for updates from AUR</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">24</property>
-                    <property name="margin_start">24</property>
-                    <property name="hexpand">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="name">aur</property>
                 <property name="title" translatable="yes">AUR</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
@@ -780,7 +876,7 @@ All AUR users should be familiar with the build process.</property>
               <packing>
                 <property name="name">cache</property>
                 <property name="title" translatable="yes">Cache</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
@@ -807,6 +903,9 @@ All AUR users should be familiar with the build process.</property>
             <property name="halign">center</property>
             <property name="stack">stack</property>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>

data/interface/preferences_dialog_no_aur.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.1 -->
 <interface>
   <requires lib="gtk+" version="3.14"/>
   <object class="GtkAdjustment" id="cache_keep_nb_adjustment">
@@ -375,6 +375,102 @@
                 <property name="title" translatable="yes">General</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="terminal_config_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">6</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkGrid">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkColorButton" id="terminal_background">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a background color</property>
+                        <property name="rgba">rgb(0,0,0)</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkColorButton" id="terminal_foreground">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a text color</property>
+                        <property name="rgba">rgb(255,255,255)</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Background:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Text:</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="name">terminal</property>
+                <property name="title" translatable="yes">Terminal</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox" id="mirrors_config_box">
                 <property name="visible">True</property>
@@ -487,7 +583,7 @@
               <packing>
                 <property name="name">official_repositories</property>
                 <property name="title" translatable="yes">Official Repositories</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -583,7 +679,7 @@
               <packing>
                 <property name="name">cache</property>
                 <property name="title" translatable="yes">Cache</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
@@ -610,6 +706,9 @@
             <property name="halign">center</property>
             <property name="stack">stack</property>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>

data/mime/CMakeLists.txt

@@ -5,13 +5,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
+		/usr/share/mime/packages
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
+		/usr/share/mime/packages
 	)
 ENDIF()
 

data/polkit/CMakeLists.txt

@@ -5,13 +5,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions
+		/usr/share/polkit-1/actions
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy
 	DESTINATION
-		${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions
+		/usr/share/polkit-1/actions
 	)
 ENDIF()
 

data/systemd/CMakeLists.txt

@@ -5,13 +5,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ENDIF()
 
@@ -19,13 +19,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ENDIF()
 
@@ -33,13 +33,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ENDIF()
 
@@ -47,13 +47,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ENDIF()
 
@@ -61,13 +61,13 @@ IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer)
 	install(DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ELSE()
 	install(FILES
 		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer
 	DESTINATION
-		${CMAKE_INSTALL_LIBDIR}/systemd/system
+		/usr/lib/systemd/system
 	)
 ENDIF()
 

meson.build

@@ -0,0 +1,130 @@
+project('pamac',['c','vala'])
+
+DISABLE_AUR = (get_option('DISABLE_AUR') != '')
+KDE_TRAY = (get_option('KDE_TRAY') != '')
+
+add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c')
+
+gdk_3_0_dep = dependency('gdk-3.0')
+gtk_3_0_dep = dependency('gtk+-3.0')
+json_glib_1_0_dep = dependency('json-glib-1.0')
+libalpm_dep = dependency('libalpm')
+libcurl_dep = dependency('libcurl')
+libnotify_dep = dependency('libnotify')
+libsoup_2_4_dep = dependency('libsoup-2.4')
+polkit_gobject_1_dep = dependency('polkit-gobject-1')
+vte_2_91_dep = dependency('vte-2.91')
+if KDE_TRAY
+appindicator3_0_1_dep = dependency('appindicator3-0.1')
+endif
+gio_2_0_dep = dependency('gio-2.0')
+glib_2_0_dep = dependency('glib-2.0')
+gobject_2_0_dep = dependency('gobject-2.0')
+
+subdir('po')
+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/services',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.user.service'))
+
+meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/dbus-1/system-services',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.service'))
+
+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'))
+
+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-cleancache.service'))
+
+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-cleancache.timer'))
+
+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-mirrorlist.service'))
+
+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-mirrorlist.timer'))
+
+meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/polkit-1/actions',join_paths(meson.current_source_dir(),'data/polkit','org.pamac.policy'))
+
+meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/mime/packages',join_paths(meson.current_source_dir(),'data/mime','x-alpm-package.xml'))
+
+if DISABLE_AUR
+	meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc',join_paths(meson.current_source_dir(),'data/config/noaur','pamac.conf'))
+
+else
+	meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc',join_paths(meson.current_source_dir(),'data/config','pamac.conf'))
+
+endif
+pamac_installer_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.installer.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
+
+pamac_installer_gresource_xml_file_c = pamac_installer_gresource_xml_generator.process(['data/pamac.installer.gresource.xml'])
+
+if DISABLE_AUR
+	pamac_manager_no_aur_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.manager_no_aur.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
+
+	pamac_manager_no_aur_gresource_xml_file_c = pamac_manager_no_aur_gresource_xml_generator.process(['data/pamac.manager_no_aur.gresource.xml'])
+
+	pamac_transaction_no_aur_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.transaction_no_aur.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
+
+	pamac_transaction_no_aur_gresource_xml_file_c = pamac_transaction_no_aur_gresource_xml_generator.process(['data/pamac.transaction_no_aur.gresource.xml'])
+
+else
+	pamac_manager_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.manager.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
+
+	pamac_manager_gresource_xml_file_c = pamac_manager_gresource_xml_generator.process(['data/pamac.manager.gresource.xml'])
+
+	pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.transaction.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
+
+	pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml'])
+
+endif
+if KDE_TRAY
+else
+endif
+if DISABLE_AUR
+else
+endif
+meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*'))
+
+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 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')
+	else
+		install_data('data/pamac-tray-appindicator.desktop',install_dir: '/etc/xdg/autostart')
+	endif
+else
+	if (get_option('prefix').startswith('/home/'))
+		message('Autostart file data/pamac-tray.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart')
+	else
+		install_data('data/pamac-tray.desktop',install_dir: '/etc/xdg/autostart')
+	endif
+endif
+	install_data('data/interface/choose_ignorepkgs_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+	install_data('data/interface/choose_provider_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+	install_data('data/interface/history_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+	install_data('data/interface/progress_box.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+	install_data('data/interface/transaction_sum_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+if DISABLE_AUR
+		install_data('data/interface/manager_window_no_aur.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+		install_data('data/interface/preferences_dialog_no_aur.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+else
+		install_data('data/interface/manager_window.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+		install_data('data/interface/preferences_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+endif
+install_data('data/icons/16x16/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/16x16/apps'))
+install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
+install_data('data/icons/24x24/status/pamac-tray-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
+install_data('data/icons/32x32/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/32x32/apps'))
+install_data('data/pixmaps/package-available-locked.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-available.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-installed-locked.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-installed-updated.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-reinstall.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-remove.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+install_data('data/pixmaps/package-upgrade.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+subdir('src')
+subdir('src/aur')
+subdir('src/pamac-user-daemon')
+subdir('src/pamac-tray')
+subdir('src/pamac-clean-cache')
+subdir('src/pamac-install')
+subdir('src/pamac-manager')
+subdir('src/pamac-system-daemon')

meson_options.txt

@@ -0,0 +1,2 @@
+option('DISABLE_AUR',type : 'string', value: '')
+option('KDE_TRAY',type : 'string', value: '')

meson_scripts/install_data.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+mkdir -p $DESTDIR/$1
+if [[ -d $2 ]]; then
+	cp -a $2/* $DESTDIR/$1
+else
+	cp -a $2 $DESTDIR/$1
+fi

meson_scripts/install_library.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/share/vala/vapi"
+mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/share/gir-1.0"
+mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/include"
+
+install -m 644 "${MESON_BUILD_ROOT}/$1/$2.vapi" "${DESTDIR}${MESON_INSTALL_PREFIX}/share/vala/vapi"
+install -m 644 "${MESON_BUILD_ROOT}/$1/$2.h" "${DESTDIR}${MESON_INSTALL_PREFIX}/include"
+install -m 644 "${MESON_BUILD_ROOT}/$1/$2@sha/$3" "${DESTDIR}${MESON_INSTALL_PREFIX}/share/gir-1.0"

pamac.avprj

@@ -3,20 +3,20 @@ autovala_version: 24
 project_name: pamac
 vala_version: 0.38
 
-custom: data/dbus/org.pamac.system.conf ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
+custom: data/dbus/org.pamac.system.conf /etc/dbus-1/system.d
-custom: data/dbus/org.pamac.user.service ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services
+custom: data/dbus/org.pamac.user.service /usr/share/dbus-1/services
-custom: data/dbus/org.pamac.system.service ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services
+custom: data/dbus/org.pamac.system.service /usr/share/dbus-1/system-services
-custom: data/systemd/pamac-system.service ${CMAKE_INSTALL_LIBDIR}/systemd/system
+custom: data/systemd/pamac-system.service /usr/lib/systemd/system
-custom: data/systemd/pamac-cleancache.service ${CMAKE_INSTALL_LIBDIR}/systemd/system
+custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system
-custom: data/systemd/pamac-cleancache.timer ${CMAKE_INSTALL_LIBDIR}/systemd/system
+custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system
-custom: data/systemd/pamac-mirrorlist.service ${CMAKE_INSTALL_LIBDIR}/systemd/system
+custom: data/systemd/pamac-mirrorlist.service /usr/lib/systemd/system
-custom: data/systemd/pamac-mirrorlist.timer ${CMAKE_INSTALL_LIBDIR}/systemd/system
+custom: data/systemd/pamac-mirrorlist.timer /usr/lib/systemd/system
-custom: data/polkit/org.pamac.policy ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions
+custom: data/polkit/org.pamac.policy /usr/share/polkit-1/actions
-custom: data/mime/x-alpm-package.xml ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
+custom: data/mime/x-alpm-package.xml /usr/share/mime/packages
 if DISABLE_AUR
-custom: data/config/noaur/pamac.conf ${CMAKE_INSTALL_SYSCONFDIR}
+custom: data/config/noaur/pamac.conf /etc
 else
-custom: data/config/pamac.conf ${CMAKE_INSTALL_SYSCONFDIR}
+custom: data/config/pamac.conf /etc
 end
 
 define: KDE_TRAY
@@ -34,7 +34,7 @@ end
 vapidir: src/vapis
 
 vala_binary: src/pamac-clean-cache/pamac-clean-cache
-version: 6.1.0
+version: 6.2.1
 vala_local_package: Pamac
 vala_package: posix
 vala_check_package: gtk+-3.0
@@ -45,7 +45,7 @@ vala_check_package: gtk+-3.0
 *vala_source: pamac_config.vala
 
 vala_binary: src/pamac-install/pamac-install
-version: 6.1.0
+version: 6.2.1
 use_gresource: pamac_installer_gresource_xml
 vala_local_package: Pamac
 vala_check_package: gtk+-3.0
@@ -56,7 +56,7 @@ vala_check_package: gtk+-3.0
 *vala_source: progress_dialog.vala
 
 vala_binary: src/pamac-manager/pamac-manager
-version: 6.1.0
+version: 6.2.1
 use_gresource: pamac_manager_gresource_xml
 vala_local_package: Pamac
 vala_check_package: gtk+-3.0
@@ -68,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.1.0
+version: 6.2.1
 vala_local_package: Pamac
 if NOT DISABLE_AUR
 vala_local_package: AUR
@@ -89,7 +89,7 @@ vala_check_package: polkit-gobject-1
 *vala_source: system_daemon.vala
 
 vala_binary: src/pamac-tray/pamac-tray
-version: 6.1.0
+version: 6.2.1
 vala_local_package: Pamac
 if NOT DISABLE_AUR
 vala_local_package: AUR
@@ -115,7 +115,7 @@ end
 *vala_source: user_daemon.vala
 
 vala_binary: src/pamac-user-daemon/pamac-user-daemon
-version: 6.1.0
+version: 6.2.1
 vala_local_package: Pamac
 if NOT DISABLE_AUR
 vala_local_package: AUR
@@ -133,7 +133,7 @@ vala_check_package: libsoup-2.4
 
 
 vala_library: src/pamac
-version: 6.1.0
+version: 6.2.1
 *namespace: Pamac
 use_gresource: pamac_transaction_gresource_xml
 vala_package: posix
@@ -159,7 +159,7 @@ vala_check_package: vte-2.91
 *vala_source: transaction_sum_dialog.vala
 
 vala_library: src/aur/aur
-version: 6.1.0
+version: 6.2.1
 *namespace: AUR
 vala_check_package: json-glib-1.0
 vala_check_package: libsoup-2.4
@@ -256,5 +256,5 @@ end
 *pixmap: data/pixmaps/package-upgrade.png
 
 # These depends are needed to enable parallel builds
-include: src/pamac-manager/CMakeDepends.txt
+include: src/CMakeSymlinks.txt
 

po/meson.build

@@ -0,0 +1,2 @@
+i18n = import('i18n')
+i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'es_419', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ'])

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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 link_libraries ( ${DEPS_LIBRARIES} )
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -82,11 +82,12 @@ GENERATE_HEADER
 SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE})
 add_library(Pamac SHARED ${VALA_C})
 
-add_dependencies (Pamac pamac_transaction_gresource_xml)
+set ( Pamac_DEPENDENCIES ${Pamac_DEPENDENCIES} pamac_transaction_gresource_xml )
+add_dependencies( Pamac ${Pamac_DEPENDENCIES} )
 target_link_libraries( Pamac m )
 set_target_properties( Pamac PROPERTIES
 VERSION
-	6.1.0
+	6.2.1
 SOVERSION
 	6 )
 
@@ -142,4 +143,7 @@ install(CODE "MESSAGE (\"
 * Run 'sudo ldconfig' to complete installation *
 ************************************************
 
-\") " )
+\") " )
+
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeSymlinks.txt)

src/Pamac.pc

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
 
 Name: Pamac
 Description: Pamac
-Version: 6.1.0
+Version: 6.2.1
 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.1.0
+Version: 6.2.1
 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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 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.1.0
+	6.2.1
 SOVERSION
 	6 )
 

src/aur/meson.build

@@ -0,0 +1,46 @@
+cfg_aur = configuration_data()
+cfg_aur.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_aur.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_aur.set('GETTEXT_PACKAGE', 'pamac')
+cfg_aur.set('RELEASE_NAME', 'pamac')
+cfg_aur.set('PREFIX', get_option('prefix'))
+cfg_aur.set('VERSION', '6.2.1')
+cfg_aur.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_aur)
+
+aur_deps = [json_glib_1_0_dep]
+aur_deps += [libsoup_2_4_dep]
+aur_deps += [glib_2_0_dep]
+aur_sources = [cfgfile_2]
+aur_sources += ['aur.vala']
+aur_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+aur_c_args = []
+if DISABLE_AUR
+  aur_vala_args += ['-D', 'DISABLE_AUR']
+  aur_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  aur_vala_args += ['-D', 'KDE_TRAY']
+  aur_c_args += ['-DKDE_TRAY']
+endif
+aur_vala_args += ['--gir=AUR-6.0.gir']
+
+
+AUR_library = shared_library('AUR',aur_sources,dependencies: aur_deps,vala_args: aur_vala_args,c_args: aur_c_args,version: '6.2.1',soversion: '6',install: true)
+
+aur_requires = []
+aur_requires += ['json-glib-1.0']
+aur_requires += ['libsoup-2.4']
+aur_requires += ['glib-2.0']
+pkg_mod = import('pkgconfig')
+pkg_mod.generate(libraries : AUR_library,
+	version : '6.2.1',
+	name : 'AUR',
+	filebase : 'AUR',
+	description : 'AUR',
+	requires : aur_requires)
+
+install_data(join_paths(meson.current_source_dir(),'AUR.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
+meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src/aur','AUR','AUR-6.0.gir')
+

src/meson.build

@@ -0,0 +1,78 @@
+cfg_pamac = configuration_data()
+cfg_pamac.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac.set('RELEASE_NAME', 'pamac')
+cfg_pamac.set('PREFIX', get_option('prefix'))
+cfg_pamac.set('VERSION', '6.2.1')
+cfg_pamac.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac)
+
+pamac_deps = [gdk_3_0_dep]
+pamac_deps += [gtk_3_0_dep]
+pamac_deps += [libalpm_dep]
+pamac_deps += [libnotify_dep]
+pamac_deps += [vte_2_91_dep]
+pamac_deps += [gio_2_0_dep]
+pamac_deps += [glib_2_0_dep]
+pamac_deps += [gobject_2_0_dep]
+pamac_sources = [cfgfile_1]
+pamac_sources += ['alpm_config.vala']
+pamac_sources += ['choose_ignorepkgs_dialog.vala']
+pamac_sources += ['choose_provider_dialog.vala']
+pamac_sources += ['common.vala']
+pamac_sources += ['mirrors_config.vala']
+pamac_sources += ['package.vala']
+pamac_sources += ['pamac_config.vala']
+pamac_sources += ['preferences_dialog.vala']
+pamac_sources += ['progress_box.vala']
+pamac_sources += ['transaction.vala']
+pamac_sources += ['transaction_sum_dialog.vala']
+if DISABLE_AUR
+pamac_sources += [pamac_transaction_no_aur_gresource_xml_file_c]
+else
+pamac_sources += [pamac_transaction_gresource_xml_file_c]
+endif
+pamac_vala_args = ['--pkg','posix']
+pamac_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+if DISABLE_AUR
+pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction_no_aur.gresource.xml')]
+else
+pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')]
+endif
+pamac_c_args = []
+if DISABLE_AUR
+  pamac_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_vala_args += ['-D', 'KDE_TRAY']
+  pamac_c_args += ['-DKDE_TRAY']
+endif
+pamac_deps += [meson.get_compiler('c').find_library('m', required : false)]
+pamac_vala_args += ['--gir=Pamac-6.0.gir']
+
+
+Pamac_library = shared_library('Pamac',pamac_sources,dependencies: pamac_deps,vala_args: pamac_vala_args,c_args: pamac_c_args,version: '6.2.1',soversion: '6',install: true)
+
+pamac_requires = []
+pamac_requires += ['gdk-3.0']
+pamac_requires += ['gtk+-3.0']
+pamac_requires += ['libalpm']
+pamac_requires += ['libnotify']
+pamac_requires += ['vte-2.91']
+pamac_requires += ['gio-2.0']
+pamac_requires += ['glib-2.0']
+pamac_requires += ['gobject-2.0']
+pkg_mod = import('pkgconfig')
+pkg_mod.generate(libraries : Pamac_library,
+	version : '6.2.1',
+	name : 'Pamac',
+	filebase : 'Pamac',
+	description : 'Pamac',
+	requires : pamac_requires)
+
+install_data(join_paths(meson.current_source_dir(),'Pamac.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
+meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','Pamac','Pamac-6.0.gir')
+

src/pamac-clean-cache/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.1.0")
+set (VERSION "6.2.1")
 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")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac )

src/pamac-clean-cache/meson.build

@@ -0,0 +1,34 @@
+cfg_pamac_clean_cache = configuration_data()
+cfg_pamac_clean_cache.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac')
+cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
+cfg_pamac_clean_cache.set('VERSION', '6.2.1')
+cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
+
+pamac_clean_cache_deps = [gtk_3_0_dep]
+pamac_clean_cache_deps += [gio_2_0_dep]
+pamac_clean_cache_deps += [glib_2_0_dep]
+pamac_clean_cache_deps += [gobject_2_0_dep]
+pamac_clean_cache_sources = [cfgfile_5]
+pamac_clean_cache_sources += ['clean_cache.vala']
+pamac_clean_cache_sources += ['pamac_config.vala']
+pamac_clean_cache_vala_args = ['--pkg','posix']
+pamac_clean_cache_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_clean_cache_dependencies = [Pamac_library]
+pamac_clean_cache_c_args = []
+if DISABLE_AUR
+  pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_clean_cache_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_clean_cache_vala_args += ['-D', 'KDE_TRAY']
+  pamac_clean_cache_c_args += ['-DKDE_TRAY']
+endif
+pamac_clean_cache_hfolders = ['../../src']
+
+executable('pamac-clean-cache',pamac_clean_cache_sources,dependencies: pamac_clean_cache_deps,vala_args: pamac_clean_cache_vala_args,c_args: pamac_clean_cache_c_args,link_with: pamac_clean_cache_dependencies,include_directories: include_directories(pamac_clean_cache_hfolders),install: true)
+

src/pamac-install/CMakeDepends.txt

@@ -1 +0,0 @@
-add_dependencies(pamac-install Pamac)

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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac )
@@ -64,7 +64,7 @@ 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_installer_gresource_xml )
 set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} Pamac )
 add_dependencies( pamac-install ${pamac-install_DEPENDENCIES} )
 

src/pamac-install/meson.build

@@ -0,0 +1,35 @@
+cfg_pamac_install = configuration_data()
+cfg_pamac_install.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_install.set('RELEASE_NAME', 'pamac')
+cfg_pamac_install.set('PREFIX', get_option('prefix'))
+cfg_pamac_install.set('VERSION', '6.2.1')
+cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
+
+pamac_install_deps = [gtk_3_0_dep]
+pamac_install_deps += [gio_2_0_dep]
+pamac_install_deps += [glib_2_0_dep]
+pamac_install_deps += [gobject_2_0_dep]
+pamac_install_sources = [cfgfile_6]
+pamac_install_sources += ['installer.vala']
+pamac_install_sources += ['progress_dialog.vala']
+pamac_install_sources += [pamac_installer_gresource_xml_file_c]
+pamac_install_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_install_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.installer.gresource.xml')]
+pamac_install_dependencies = [Pamac_library]
+pamac_install_c_args = []
+if DISABLE_AUR
+  pamac_install_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_install_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_install_vala_args += ['-D', 'KDE_TRAY']
+  pamac_install_c_args += ['-DKDE_TRAY']
+endif
+pamac_install_hfolders = ['../../src']
+
+executable('pamac-install',pamac_install_sources,dependencies: pamac_install_deps,vala_args: pamac_install_vala_args,c_args: pamac_install_c_args,link_with: pamac_install_dependencies,include_directories: include_directories(pamac_install_hfolders),install: true)
+

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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac )
@@ -66,7 +66,7 @@ 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_manager_gresource_xml )
 set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} Pamac )
 add_dependencies( pamac-manager ${pamac-manager_DEPENDENCIES} )
 
@@ -91,4 +91,3 @@ if(HAVE_VALADOC)
 		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
 	)
 endif()
-include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt)

src/pamac-manager/meson.build

@@ -0,0 +1,44 @@
+cfg_pamac_manager = configuration_data()
+cfg_pamac_manager.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_manager.set('RELEASE_NAME', 'pamac')
+cfg_pamac_manager.set('PREFIX', get_option('prefix'))
+cfg_pamac_manager.set('VERSION', '6.2.1')
+cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
+
+pamac_manager_deps = [gtk_3_0_dep]
+pamac_manager_deps += [gio_2_0_dep]
+pamac_manager_deps += [glib_2_0_dep]
+pamac_manager_deps += [gobject_2_0_dep]
+pamac_manager_sources = [cfgfile_7]
+pamac_manager_sources += ['history_dialog.vala']
+pamac_manager_sources += ['manager.vala']
+pamac_manager_sources += ['manager_window.vala']
+if DISABLE_AUR
+pamac_manager_sources += [pamac_manager_no_aur_gresource_xml_file_c]
+else
+pamac_manager_sources += [pamac_manager_gresource_xml_file_c]
+endif
+pamac_manager_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+if DISABLE_AUR
+pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager_no_aur.gresource.xml')]
+else
+pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager.gresource.xml')]
+endif
+pamac_manager_dependencies = [Pamac_library]
+pamac_manager_c_args = []
+if DISABLE_AUR
+  pamac_manager_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_manager_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_manager_vala_args += ['-D', 'KDE_TRAY']
+  pamac_manager_c_args += ['-DKDE_TRAY']
+endif
+pamac_manager_hfolders = ['../../src']
+
+executable('pamac-manager',pamac_manager_sources,dependencies: pamac_manager_deps,vala_args: pamac_manager_vala_args,c_args: pamac_manager_c_args,link_with: pamac_manager_dependencies,include_directories: include_directories(pamac_manager_hfolders),install: true)
+

src/pamac-system-daemon/CMakeDepends.txt

@@ -1 +0,0 @@
-add_dependencies(pamac-system-daemon AUR Pamac)

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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

src/pamac-system-daemon/meson.build

@@ -0,0 +1,45 @@
+cfg_pamac_system_daemon = configuration_data()
+cfg_pamac_system_daemon.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac')
+cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
+cfg_pamac_system_daemon.set('VERSION', '6.2.1')
+cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_8 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
+
+pamac_system_daemon_deps = [gtk_3_0_dep]
+pamac_system_daemon_deps += [json_glib_1_0_dep]
+pamac_system_daemon_deps += [libalpm_dep]
+pamac_system_daemon_deps += [libcurl_dep]
+pamac_system_daemon_deps += [libsoup_2_4_dep]
+pamac_system_daemon_deps += [polkit_gobject_1_dep]
+pamac_system_daemon_deps += [gio_2_0_dep]
+pamac_system_daemon_deps += [glib_2_0_dep]
+pamac_system_daemon_deps += [gobject_2_0_dep]
+pamac_system_daemon_sources = [cfgfile_8]
+pamac_system_daemon_sources += ['alpm_config.vala']
+pamac_system_daemon_sources += ['mirrors_config.vala']
+pamac_system_daemon_sources += ['pamac_config.vala']
+pamac_system_daemon_sources += ['system_daemon.vala']
+pamac_system_daemon_vala_args = ['--pkg','posix']
+pamac_system_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_system_daemon_dependencies = [Pamac_library]
+if not DISABLE_AUR
+pamac_system_daemon_dependencies += [AUR_library]
+endif
+pamac_system_daemon_c_args = []
+if DISABLE_AUR
+  pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_system_daemon_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_system_daemon_vala_args += ['-D', 'KDE_TRAY']
+  pamac_system_daemon_c_args += ['-DKDE_TRAY']
+endif
+pamac_system_daemon_hfolders = ['../../src']
+pamac_system_daemon_hfolders += ['../../src/aur']
+
+executable('pamac-system-daemon',pamac_system_daemon_sources,dependencies: pamac_system_daemon_deps,vala_args: pamac_system_daemon_vala_args,c_args: pamac_system_daemon_c_args,link_with: pamac_system_daemon_dependencies,include_directories: include_directories(pamac_system_daemon_hfolders),install: true)
+

src/pamac-system-daemon/pamac_config.vala

@@ -1,337 +0,0 @@
-/*
- *  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/>.
- */
-
-namespace Pamac {
-	class Config {
-		string conf_path;
-		HashTable<string,string> _environment_variables;
-
-		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;
-			}
-		}
-
-		public Config (string path) {
-			conf_path = path;
-			//get environment variables
-			_environment_variables = new HashTable<string,string> (str_hash, str_equal);
-			var utsname = Posix.utsname();
-			_environment_variables.insert ("HTTP_USER_AGENT", "pamac (%s %s)".printf (utsname.sysname, utsname.machine));
-			unowned string? variable = Environment.get_variable ("http_proxy");
-			if (variable != null) {
-				_environment_variables.insert ("http_proxy", variable);
-			}
-			variable = Environment.get_variable ("https_proxy");
-			if (variable != null) {
-				_environment_variables.insert ("https_proxy", variable);
-			}
-			variable = Environment.get_variable ("ftp_proxy");
-			if (variable != null) {
-				_environment_variables.insert ("ftp_proxy", variable);
-			}
-			variable = Environment.get_variable ("socks_proxy");
-			if (variable != null) {
-				_environment_variables.insert ("socks_proxy", variable);
-			}
-			variable = Environment.get_variable ("no_proxy");
-			if (variable != null) {
-				_environment_variables.insert ("no_proxy", variable);
-			}
-			// set default option
-			refresh_period = 6;
-			reload ();
-		}
-
-		public void reload () {
-			// 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);
-		}
-
-		void parse_file (string path) {
-			var file = GLib.File.new_for_path (path);
-			if (file.query_exists ()) {
-				try {
-					// Open file for reading and wrap returned FileInputStream into a
-					// DataInputStream, so we can read line by line
-					var dis = new DataInputStream (file.read ());
-					string? line;
-					// Read lines until end of file (null) is reached
-					while ((line = dis.read_line ()) != null) {
-						if (line.length == 0) {
-							continue;
-						}
-						// ignore whole line and end of line comments
-						string[] splitted = line.split ("#", 2);
-						line = splitted[0].strip ();
-						if (line.length == 0) {
-							continue;
-						}
-						splitted = line.split ("=", 2);
-						unowned string key = splitted[0]._strip ();
-						if (key == "RemoveUnrequiredDeps") {
-							recurse = true;
-						} else if (key == "RefreshPeriod") {
-							if (splitted.length == 2) {
-								unowned string val = splitted[1]._strip ();
-								refresh_period = uint64.parse (val);
-							}
-						} else if (key == "NoUpdateHideIcon") {
-							no_update_hide_icon = true;
-#if DISABLE_AUR
-#else
-						} else if (key == "EnableAUR") {
-							enable_aur = true;
-						} else if (key == "SearchInAURByDefault") {
-							search_aur = true;
-						} else if (key == "BuildDirectory") {
-							if (splitted.length == 2) {
-								aur_build_dir = splitted[1]._strip ();
-							}
-						} 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) {
-					GLib.stderr.printf("%s\n", e.message);
-				}
-			} else {
-				GLib.stderr.printf ("File '%s' doesn't exist.\n", path);
-			}
-		}
-
-		public void write (HashTable<string,Variant> new_conf) {
-			var file = GLib.File.new_for_path (conf_path);
-			var data = new GLib.List<string> ();
-			if (file.query_exists ()) {
-				try {
-					// Open file for reading and wrap returned FileInputStream into a
-					// DataInputStream, so we can read line by line
-					var dis = new DataInputStream (file.read ());
-					string? line;
-					// Read lines until end of file (null) is reached
-					while ((line = dis.read_line ()) != null) {
-						if (line.length == 0) {
-							data.append ("\n");
-							continue;
-						}
-						unowned Variant variant;
-						if (line.contains ("RemoveUnrequiredDeps")) {
-							if (new_conf.lookup_extended ("RemoveUnrequiredDeps", null, out variant)) {
-								if (variant.get_boolean ()) {
-									data.append ("RemoveUnrequiredDeps\n");
-								} else {
-									data.append ("#RemoveUnrequiredDeps\n");
-								}
-								new_conf.remove ("RemoveUnrequiredDeps");
-							} else {
-								data.append (line + "\n");
-							}
-						} else if (line.contains ("RefreshPeriod")) {
-							if (new_conf.lookup_extended ("RefreshPeriod", null, out variant)) {
-								data.append ("RefreshPeriod = %llu\n".printf (variant.get_uint64 ()));
-								new_conf.remove ("RefreshPeriod");
-							} else {
-								data.append (line + "\n");
-							}
-						} else if (line.contains ("NoUpdateHideIcon")) {
-							if (new_conf.lookup_extended ("NoUpdateHideIcon", null, out variant)) {
-								if (variant.get_boolean ()) {
-									data.append ("NoUpdateHideIcon\n");
-								} else {
-									data.append ("#NoUpdateHideIcon\n");
-								}
-								new_conf.remove ("NoUpdateHideIcon");
-							} 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 ()) {
-									data.append ("EnableAUR\n");
-								} else {
-									data.append ("#EnableAUR\n");
-								}
-								new_conf.remove ("EnableAUR");
-							} else {
-								data.append (line + "\n");
-							}
-						} else if (line.contains ("SearchInAURByDefault")) {
-							if (new_conf.lookup_extended ("SearchInAURByDefault", null, out variant)) {
-								if (variant.get_boolean ()) {
-									data.append ("SearchInAURByDefault\n");
-								} else {
-									data.append ("#SearchInAURByDefault\n");
-								}
-								new_conf.remove ("SearchInAURByDefault");
-							} else {
-								data.append (line + "\n");
-							}
-						} else if (line.contains ("BuildDirectory")) {
-							if (new_conf.lookup_extended ("BuildDirectory", null, out variant)) {
-								data.append ("BuildDirectory = %s\n".printf (variant.get_string ()));
-								new_conf.remove ("BuildDirectory");
-							} else {
-								data.append (line + "\n");
-							}
-						} else if (line.contains ("CheckAURUpdates")) {
-							if (new_conf.lookup_extended ("CheckAURUpdates", null, out variant)) {
-								if (variant.get_boolean ()) {
-									data.append ("CheckAURUpdates\n");
-								} else {
-									data.append ("#CheckAURUpdates\n");
-								}
-								new_conf.remove ("CheckAURUpdates");
-							} 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");
-						}
-					}
-					// delete the file before rewrite it
-					file.delete ();
-				} catch (GLib.Error e) {
-					GLib.stderr.printf("%s\n", e.message);
-				}
-			} else {
-				GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path);
-			}
-			// create lines for unexisted options
-			if (new_conf.size () != 0) {
-				data.append ("\n");
-				var iter = HashTableIter<string,Variant> (new_conf);
-				unowned string key;
-				unowned Variant val;
-				while (iter.next (out key, out val)) {
-					if (key == "RemoveUnrequiredDeps") {
-						if (val.get_boolean ()) {
-							data.append ("RemoveUnrequiredDeps\n");
-						} else {
-							data.append ("#RemoveUnrequiredDeps\n");
-						}
-					} else if (key == "RefreshPeriod") {
-						data.append ("RefreshPeriod = %llu\n".printf (val.get_uint64 ()));
-					} else if (key =="NoUpdateHideIcon") {
-						if (val.get_boolean ()) {
-							data.append ("NoUpdateHideIcon\n");
-						} else {
-							data.append ("#NoUpdateHideIcon\n");
-						}
-#if DISABLE_AUR
-#else
-					} else if (key == "EnableAUR") {
-						if (val.get_boolean ()) {
-							data.append ("EnableAUR\n");
-						} else {
-							data.append ("#EnableAUR\n");
-						}
-					} else if (key == "SearchInAURByDefault") {
-						if (val.get_boolean ()) {
-							data.append ("SearchInAURByDefault\n");
-						} else {
-							data.append ("#SearchInAURByDefault\n");
-						}
-					} else if (key == "BuildDirectory") {
-						data.append ("BuildDirectory = %s\n".printf (val.get_string ()));
-					} else if (key == "CheckAURUpdates") {
-						if (val.get_boolean ()) {
-							data.append ("CheckAURUpdates\n");
-						} 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");
-						}
-					}
-				}
-			}
-			// write the file
-			try {
-				// creating a DataOutputStream to the file
-				var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION));
-				foreach (unowned string new_line in data) {
-					// writing a short string to the stream
-					dos.put_string (new_line);
-				}
-			} catch (GLib.Error e) {
-				GLib.stderr.printf("%s\n", e.message);
-			}
-		}
-	}
-}

src/pamac-system-daemon/pamac_config.vala

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

src/pamac-tray/CMakeDepends.txt

@@ -1 +0,0 @@
-add_dependencies(pamac-tray Pamac AUR)

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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

src/pamac-tray/meson.build

@@ -0,0 +1,50 @@
+cfg_pamac_tray = configuration_data()
+cfg_pamac_tray.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_tray.set('RELEASE_NAME', 'pamac')
+cfg_pamac_tray.set('PREFIX', get_option('prefix'))
+cfg_pamac_tray.set('VERSION', '6.2.1')
+cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
+
+pamac_tray_deps = [json_glib_1_0_dep]
+pamac_tray_deps += [libnotify_dep]
+if KDE_TRAY
+pamac_tray_deps += [appindicator3_0_1_dep]
+else
+pamac_tray_deps += [gtk_3_0_dep]
+endif
+pamac_tray_deps += [gio_2_0_dep]
+pamac_tray_deps += [glib_2_0_dep]
+pamac_tray_deps += [gobject_2_0_dep]
+pamac_tray_sources = [cfgfile_4]
+if KDE_TRAY
+pamac_tray_sources += ['tray-appindicator.vala']
+else
+pamac_tray_sources += ['tray-gtk.vala']
+endif
+pamac_tray_sources += ['pamac_config.vala']
+pamac_tray_sources += ['tray.vala']
+pamac_tray_sources += ['user_daemon.vala']
+pamac_tray_vala_args = ['--pkg','posix']
+pamac_tray_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_tray_dependencies = [Pamac_library]
+if not DISABLE_AUR
+pamac_tray_dependencies += [AUR_library]
+endif
+pamac_tray_c_args = []
+if DISABLE_AUR
+  pamac_tray_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_tray_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_tray_vala_args += ['-D', 'KDE_TRAY']
+  pamac_tray_c_args += ['-DKDE_TRAY']
+endif
+pamac_tray_hfolders = ['../../src']
+pamac_tray_hfolders += ['../../src/aur']
+
+executable('pamac-tray',pamac_tray_sources,dependencies: pamac_tray_deps,vala_args: pamac_tray_vala_args,c_args: pamac_tray_c_args,link_with: pamac_tray_dependencies,include_directories: include_directories(pamac_tray_hfolders),install: true)
+

src/pamac-user-daemon/CMakeDepends.txt

@@ -1 +0,0 @@
-add_dependencies(pamac-user-daemon Pamac AUR)

src/pamac-user-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.1.0")
+set (VERSION "6.2.1")
 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.1.0")
+set (VERSION "6.2.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
 link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

src/pamac-user-daemon/meson.build

@@ -0,0 +1,41 @@
+cfg_pamac_user_daemon = configuration_data()
+cfg_pamac_user_daemon.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac')
+cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
+cfg_pamac_user_daemon.set('VERSION', '6.2.1')
+cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
+
+cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
+
+pamac_user_daemon_deps = [gtk_3_0_dep]
+pamac_user_daemon_deps += [json_glib_1_0_dep]
+pamac_user_daemon_deps += [libalpm_dep]
+pamac_user_daemon_deps += [libsoup_2_4_dep]
+pamac_user_daemon_deps += [gio_2_0_dep]
+pamac_user_daemon_deps += [glib_2_0_dep]
+pamac_user_daemon_deps += [gobject_2_0_dep]
+pamac_user_daemon_sources = [cfgfile_3]
+pamac_user_daemon_sources += ['alpm_config.vala']
+pamac_user_daemon_sources += ['user_daemon.vala']
+pamac_user_daemon_vala_args = ['--pkg','posix']
+pamac_user_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_user_daemon_dependencies = [Pamac_library]
+if not DISABLE_AUR
+pamac_user_daemon_dependencies += [AUR_library]
+endif
+pamac_user_daemon_c_args = []
+if DISABLE_AUR
+  pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_user_daemon_c_args += ['-DDISABLE_AUR']
+endif
+if KDE_TRAY
+  pamac_user_daemon_vala_args += ['-D', 'KDE_TRAY']
+  pamac_user_daemon_c_args += ['-DKDE_TRAY']
+endif
+pamac_user_daemon_hfolders = ['../../src']
+pamac_user_daemon_hfolders += ['../../src/aur']
+
+executable('pamac-user-daemon',pamac_user_daemon_sources,dependencies: pamac_user_daemon_deps,vala_args: pamac_user_daemon_vala_args,c_args: pamac_user_daemon_c_args,link_with: pamac_user_daemon_dependencies,include_directories: include_directories(pamac_user_daemon_hfolders),install: true)
+

src/pamac_config.vala

@@ -35,6 +35,8 @@ namespace Pamac {
 #endif
 		public uint64 keep_num_pkgs { get; private set; }
 		public bool rm_only_uninstalled { get; private set; }
+		public string terminal_background { get; private set; }
+		public string terminal_foreground { get; private set; }
 		public unowned HashTable<string,string> environment_variables {
 			get {
 				return _environment_variables;
@@ -85,6 +87,8 @@ namespace Pamac {
 #endif
 			keep_num_pkgs = 3;
 			rm_only_uninstalled = false;
+			terminal_background = "rgb(0,0,0)";
+			terminal_foreground = "rgb(255,255,255)";
 			parse_file (conf_path);
 		}
 
@@ -138,6 +142,14 @@ namespace Pamac {
 							}
 						} else if (key == "OnlyRmUninstalled") {
 							rm_only_uninstalled = true;
+						} else if (key == "BackgroundColor") {
+							if (splitted.length == 2) {
+								terminal_background = splitted[1]._strip ();
+							}
+						} else if (key == "ForegroundColor") {
+							if (splitted.length == 2) {
+								terminal_foreground = splitted[1]._strip ();
+							}
 						}
 					}
 				} catch (GLib.Error e) {
@@ -147,5 +159,208 @@ namespace Pamac {
 				GLib.stderr.printf ("File '%s' doesn't exist.\n", path);
 			}
 		}
+		public void write (HashTable<string,Variant> new_conf) {
+			var file = GLib.File.new_for_path (conf_path);
+			var data = new GLib.List<string> ();
+			if (file.query_exists ()) {
+				try {
+					// Open file for reading and wrap returned FileInputStream into a
+					// DataInputStream, so we can read line by line
+					var dis = new DataInputStream (file.read ());
+					string? line;
+					// Read lines until end of file (null) is reached
+					while ((line = dis.read_line ()) != null) {
+						if (line.length == 0) {
+							data.append ("\n");
+							continue;
+						}
+						unowned Variant variant;
+						if (line.contains ("RemoveUnrequiredDeps")) {
+							if (new_conf.lookup_extended ("RemoveUnrequiredDeps", null, out variant)) {
+								if (variant.get_boolean ()) {
+									data.append ("RemoveUnrequiredDeps\n");
+								} else {
+									data.append ("#RemoveUnrequiredDeps\n");
+								}
+								new_conf.remove ("RemoveUnrequiredDeps");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("RefreshPeriod")) {
+							if (new_conf.lookup_extended ("RefreshPeriod", null, out variant)) {
+								data.append ("RefreshPeriod = %llu\n".printf (variant.get_uint64 ()));
+								new_conf.remove ("RefreshPeriod");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("NoUpdateHideIcon")) {
+							if (new_conf.lookup_extended ("NoUpdateHideIcon", null, out variant)) {
+								if (variant.get_boolean ()) {
+									data.append ("NoUpdateHideIcon\n");
+								} else {
+									data.append ("#NoUpdateHideIcon\n");
+								}
+								new_conf.remove ("NoUpdateHideIcon");
+							} 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 ()) {
+									data.append ("EnableAUR\n");
+								} else {
+									data.append ("#EnableAUR\n");
+								}
+								new_conf.remove ("EnableAUR");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("SearchInAURByDefault")) {
+							if (new_conf.lookup_extended ("SearchInAURByDefault", null, out variant)) {
+								if (variant.get_boolean ()) {
+									data.append ("SearchInAURByDefault\n");
+								} else {
+									data.append ("#SearchInAURByDefault\n");
+								}
+								new_conf.remove ("SearchInAURByDefault");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("BuildDirectory")) {
+							if (new_conf.lookup_extended ("BuildDirectory", null, out variant)) {
+								data.append ("BuildDirectory = %s\n".printf (variant.get_string ()));
+								new_conf.remove ("BuildDirectory");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("CheckAURUpdates")) {
+							if (new_conf.lookup_extended ("CheckAURUpdates", null, out variant)) {
+								if (variant.get_boolean ()) {
+									data.append ("CheckAURUpdates\n");
+								} else {
+									data.append ("#CheckAURUpdates\n");
+								}
+								new_conf.remove ("CheckAURUpdates");
+							} 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 if (line.contains ("BackgroundColor")) {
+							if (new_conf.lookup_extended ("BackgroundColor", null, out variant)) {
+								data.append ("BackgroundColor = %s\n".printf (variant.get_string ()));
+								new_conf.remove ("BackgroundColor");
+							} else {
+								data.append (line + "\n");
+							}
+						} else if (line.contains ("ForegroundColor")) {
+							if (new_conf.lookup_extended ("ForegroundColor", null, out variant)) {
+								data.append ("ForegroundColor = %s\n".printf (variant.get_string ()));
+								new_conf.remove ("ForegroundColor");
+							} else {
+								data.append (line + "\n");
+							}
+						} else {
+							data.append (line + "\n");
+						}
+					}
+					// delete the file before rewrite it
+					file.delete ();
+				} catch (GLib.Error e) {
+					GLib.stderr.printf("%s\n", e.message);
+				}
+			} else {
+				GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path);
+			}
+			// create lines for unexisted options
+			if (new_conf.size () != 0) {
+				data.append ("\n");
+				var iter = HashTableIter<string,Variant> (new_conf);
+				unowned string key;
+				unowned Variant val;
+				while (iter.next (out key, out val)) {
+					if (key == "RemoveUnrequiredDeps") {
+						if (val.get_boolean ()) {
+							data.append ("RemoveUnrequiredDeps\n");
+						} else {
+							data.append ("#RemoveUnrequiredDeps\n");
+						}
+					} else if (key == "RefreshPeriod") {
+						data.append ("RefreshPeriod = %llu\n".printf (val.get_uint64 ()));
+					} else if (key =="NoUpdateHideIcon") {
+						if (val.get_boolean ()) {
+							data.append ("NoUpdateHideIcon\n");
+						} else {
+							data.append ("#NoUpdateHideIcon\n");
+						}
+#if DISABLE_AUR
+#else
+					} else if (key == "EnableAUR") {
+						if (val.get_boolean ()) {
+							data.append ("EnableAUR\n");
+						} else {
+							data.append ("#EnableAUR\n");
+						}
+					} else if (key == "SearchInAURByDefault") {
+						if (val.get_boolean ()) {
+							data.append ("SearchInAURByDefault\n");
+						} else {
+							data.append ("#SearchInAURByDefault\n");
+						}
+					} else if (key == "BuildDirectory") {
+						data.append ("BuildDirectory = %s\n".printf (val.get_string ()));
+					} else if (key == "CheckAURUpdates") {
+						if (val.get_boolean ()) {
+							data.append ("CheckAURUpdates\n");
+						} 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");
+						}
+					} else if (key == "BackgroundColor") {
+						data.append ("BackgroundColor = %s\n".printf (val.get_string ()));
+					} else if (key == "ForegroundColor") {
+						data.append ("ForegroundCOlor = %s\n".printf (val.get_string ()));
+					}
+				}
+			}
+			// write the file
+			try {
+				// creating a DataOutputStream to the file
+				var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION));
+				foreach (unowned string new_line in data) {
+					// writing a short string to the stream
+					dos.put_string (new_line);
+				}
+			} catch (GLib.Error e) {
+				GLib.stderr.printf("%s\n", e.message);
+			}
+		}
 	}
 }

src/preferences_dialog.vala

@@ -70,6 +70,10 @@ namespace Pamac {
 		Gtk.SpinButton cache_keep_nb_spin_button;
 		[GtkChild]
 		Gtk.CheckButton cache_only_uninstalled_checkbutton;
+		[GtkChild]
+		Gtk.ColorButton terminal_background;
+		[GtkChild]
+		Gtk.ColorButton terminal_foreground;
 
 		Gtk.ListStore ignorepkgs_liststore;
 		Transaction transaction;
@@ -106,6 +110,15 @@ namespace Pamac {
 			cache_keep_nb_spin_button.value = transaction.keep_num_pkgs;
 			cache_only_uninstalled_checkbutton.active = transaction.rm_only_uninstalled;
 
+			// Set up terminal colors
+			terminal_background.set_use_alpha (false);
+			terminal_foreground.set_use_alpha (false);
+			Gdk.RGBA rgba = Gdk.RGBA ();
+			bool tmp = rgba.parse (transaction.terminal_background);
+			terminal_background.rgba = rgba;
+			tmp = rgba.parse (transaction.terminal_foreground);
+			terminal_foreground.rgba = rgba;
+
 			// populate ignorepkgs_liststore
 			ignorepkgs_liststore = new Gtk.ListStore (1, typeof (string));
 			ignorepkgs_treeview.set_model (ignorepkgs_liststore);
@@ -121,6 +134,8 @@ namespace Pamac {
 			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);
+			terminal_background.color_set.connect (on_select_background);
+			terminal_foreground.color_set.connect (on_select_foreground);
 
 			AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
 			if (pkg.name == "") {
@@ -220,6 +235,20 @@ namespace Pamac {
 			transaction.start_write_pamac_config (new_pamac_conf);
 		}
 
+		void on_select_background () {
+			var new_pamac_conf = new HashTable<string,Variant> (str_hash, str_equal);
+			new_pamac_conf.insert ("BackgroundColor", new Variant.string (terminal_background.rgba.to_string ()));
+			transaction.start_write_pamac_config (new_pamac_conf);
+			transaction.update_terminal_background (terminal_background.rgba.to_string ());
+		}
+
+		void on_select_foreground () {
+			var new_pamac_conf = new HashTable<string,Variant> (str_hash, str_equal);
+			new_pamac_conf.insert ("ForegroundColor", new Variant.string (terminal_foreground.rgba.to_string ()));
+			transaction.start_write_pamac_config (new_pamac_conf);
+			transaction.update_terminal_foreground (terminal_foreground.rgba.to_string ());
+		}
+
 #if DISABLE_AUR
 #else
 		bool on_enable_aur_button_state_set (bool new_state) {

src/transaction.vala

@@ -146,6 +146,8 @@ namespace Pamac {
 #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 string terminal_background { get { return pamac_config.terminal_background; } }
+		public string terminal_foreground { get { return pamac_config.terminal_foreground; } }
 		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; } }
@@ -262,9 +264,12 @@ namespace Pamac {
 			term.set_scrollback_lines (-1);
 			term.expand = true;
 			term.visible = true;
-			var black = Gdk.RGBA ();
+			var tmp = Gdk.RGBA ();
-			black.parse ("black");
+			tmp.parse (terminal_background);
-			term.set_color_cursor (black);
+			term.set_color_cursor (tmp);
+			term.set_color_background (tmp);
+			tmp.parse (terminal_foreground);
+			term.set_color_foreground (tmp);
 			term.button_press_event.connect (on_term_button_press_event);
 			term.key_press_event.connect (on_term_key_press_event);
 			// creating pty for term
@@ -298,6 +303,19 @@ namespace Pamac {
 			warning_textbuffer = new StringBuilder ();
 		}
 
+		public void update_terminal_background (string background) {
+			var tmp = Gdk.RGBA ();
+			tmp.parse (background);
+			term.set_color_cursor (tmp);
+			term.set_color_background (tmp);
+		}
+
+		public void update_terminal_foreground (string foreground) {
+			var tmp = Gdk.RGBA ();
+			tmp.parse (foreground);
+			term.set_color_foreground (tmp);
+		}
+
 		public void run_preferences_dialog () {
 			check_authorization.begin ((obj, res) => {
 				bool authorized = check_authorization.end (res);