Browse Source

fix terminal color not updating

tags/v6.2.1
Chris Cromer 2 years ago
parent
commit
420243ca42
21 changed files with 55 additions and 40 deletions
  1. +8
    -8
      pamac.avprj
  2. +3
    -3
      src/CMakeLists.txt
  3. +1
    -1
      src/Pamac.pc
  4. +1
    -1
      src/aur/AUR.pc
  5. +3
    -3
      src/aur/CMakeLists.txt
  6. +3
    -3
      src/aur/meson.build
  7. +3
    -3
      src/meson.build
  8. +2
    -2
      src/pamac-clean-cache/CMakeLists.txt
  9. +1
    -1
      src/pamac-clean-cache/meson.build
  10. +2
    -2
      src/pamac-install/CMakeLists.txt
  11. +1
    -1
      src/pamac-install/meson.build
  12. +2
    -2
      src/pamac-manager/CMakeLists.txt
  13. +1
    -1
      src/pamac-manager/meson.build
  14. +2
    -2
      src/pamac-system-daemon/CMakeLists.txt
  15. +1
    -1
      src/pamac-system-daemon/meson.build
  16. +2
    -2
      src/pamac-tray/CMakeLists.txt
  17. +1
    -1
      src/pamac-tray/meson.build
  18. +2
    -2
      src/pamac-user-daemon/CMakeLists.txt
  19. +1
    -1
      src/pamac-user-daemon/meson.build
  20. +2
    -0
      src/preferences_dialog.vala
  21. +13
    -0
      src/transaction.vala

+ 8
- 8
pamac.avprj View File

@@ -34,7 +34,7 @@ end
vapidir: src/vapis

vala_binary: src/pamac-clean-cache/pamac-clean-cache
version: 6.2.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.2.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.2.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.2.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.2.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.2.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.2.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.2.0
version: 6.2.1
*namespace: AUR
vala_check_package: json-glib-1.0
vala_check_package: libsoup-2.4

+ 3
- 3
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.0")
set (VERSION "6.2.1")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -87,7 +87,7 @@ add_dependencies( Pamac ${Pamac_DEPENDENCIES} )
target_link_libraries( Pamac m )
set_target_properties( Pamac PROPERTIES
VERSION
6.2.0
6.2.1
SOVERSION
6 )


+ 1
- 1
src/Pamac.pc View File

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: Pamac
Description: Pamac
Version: 6.2.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

+ 1
- 1
src/aur/AUR.pc View File

@@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: AUR
Description: AUR
Version: 6.2.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

+ 3
- 3
src/aur/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.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.2.0
6.2.1
SOVERSION
6 )


+ 3
- 3
src/aur/meson.build View File

@@ -4,7 +4,7 @@ cfg_aur.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),
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.0')
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)
@@ -27,7 +27,7 @@ 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.0',soversion: '6',install: true)
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']
@@ -35,7 +35,7 @@ aur_requires += ['libsoup-2.4']
aur_requires += ['glib-2.0']
pkg_mod = import('pkgconfig')
pkg_mod.generate(libraries : AUR_library,
version : '6.2.0',
version : '6.2.1',
name : 'AUR',
filebase : 'AUR',
description : 'AUR',

+ 3
- 3
src/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'
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.0')
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)
@@ -54,7 +54,7 @@ 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.0',soversion: '6',install: true)
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']
@@ -67,7 +67,7 @@ pamac_requires += ['glib-2.0']
pamac_requires += ['gobject-2.0']
pkg_mod = import('pkgconfig')
pkg_mod.generate(libraries : Pamac_library,
version : '6.2.0',
version : '6.2.1',
name : 'Pamac',
filebase : 'Pamac',
description : 'Pamac',

+ 2
- 2
src/pamac-clean-cache/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.0")
set (VERSION "6.2.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac )

+ 1
- 1
src/pamac-clean-cache/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
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.0')
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)

+ 2
- 2
src/pamac-install/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.0")
set (VERSION "6.2.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac )

+ 1
- 1
src/pamac-install/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
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.0')
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)

+ 2
- 2
src/pamac-manager/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.0")
set (VERSION "6.2.1")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac )

+ 1
- 1
src/pamac-manager/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
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.0')
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)

+ 2
- 2
src/pamac-system-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.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 )

+ 1
- 1
src/pamac-system-daemon/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op
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.0')
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)

+ 2
- 2
src/pamac-tray/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.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 )

+ 1
- 1
src/pamac-tray/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat
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.0')
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)

+ 2
- 2
src/pamac-user-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.2.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.2.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 )

+ 1
- 1
src/pamac-user-daemon/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
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.0')
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)

+ 2
- 0
src/preferences_dialog.vala View File

@@ -239,12 +239,14 @@ namespace Pamac {
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

+ 13
- 0
src/transaction.vala View File

@@ -303,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);

Loading…
Cancel
Save