aleskva/pamac-classic
1
0
Fork 0
forked from cromer/pamac-classic
Code Issues Pull Requests Releases Wiki Activity

add global menu

Browse Source
This commit is contained in:
Chris Cromer
2017-11-01 20:02:27 -03:00
parent f545ec85d7
commit 90ffcb5fd3
106 changed files with 681 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -62,6 +62,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
@@ -96,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
target_link_libraries( pamacclassic m )
set_target_properties( pamacclassic PROPERTIES
VERSION
6.4.1
6.5.0
SOVERSION
6 )

10
src/meson.build
View File

@@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac-classic')
cfg_pamac_classic.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_classic.set('PREFIX', get_option('prefix'))
cfg_pamac_classic.set('VERSION', '6.4.1')
cfg_pamac_classic.set('VERSION', '6.5.0')
cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
@@ -47,6 +47,10 @@ if ENABLE_UPDATE_ICON
pamac_classic_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_classic_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_classic_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_classic_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_classic_vala_args += ['-D', 'KDE_TRAY']
pamac_classic_c_args += ['-DKDE_TRAY']
@@ -55,7 +59,7 @@ pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : fals
pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']
pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.4.1',soversion: '6',install: true)
pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.5.0',soversion: '6',install: true)
pamac_classic_requires = []
pamac_classic_requires += ['gdk-3.0']
@@ -70,7 +74,7 @@ pamac_classic_requires += ['glib-2.0']
pamac_classic_requires += ['gobject-2.0']
pkg_mod = import('pkgconfig')
pkg_mod.generate(libraries : pamacclassic_library,
version : '6.4.1',
version : '6.5.0',
name : 'pamacclassic',
filebase : 'pamacclassic',
description : 'pamacclassic',

9
src/pamac-clean-cache/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -46,6 +46,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

6
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-classic')
cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
cfg_pamac_clean_cache.set('VERSION', '6.4.1')
cfg_pamac_clean_cache.set('VERSION', '6.5.0')
cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
@@ -29,6 +29,10 @@ if ENABLE_UPDATE_ICON
pamac_clean_cache_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_clean_cache_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_clean_cache_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_clean_cache_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_clean_cache_vala_args += ['-D', 'KDE_TRAY']
pamac_clean_cache_c_args += ['-DKDE_TRAY']

9
src/pamac-install/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -45,6 +45,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

6
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-classic')
cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_install.set('PREFIX', get_option('prefix'))
cfg_pamac_install.set('VERSION', '6.4.1')
cfg_pamac_install.set('VERSION', '6.5.0')
cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
@@ -30,6 +30,10 @@ if ENABLE_UPDATE_ICON
pamac_install_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_install_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_install_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_install_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_install_vala_args += ['-D', 'KDE_TRAY']
pamac_install_c_args += ['-DKDE_TRAY']

9
src/pamac-manager/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -46,6 +46,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

38
src/pamac-manager/manager_window.vala
View File

@@ -20,6 +20,8 @@
//using GIO
extern void exit(int exit_code);
const string VERSION = Constants.VERSION;
namespace Pamac {
@@ -39,7 +41,6 @@ namespace Pamac {
}
}
[GtkTemplate (ui = "/org/pamac/manager/interface/manager_window.ui")]
class ManagerWindow : Gtk.ApplicationWindow {
// icons
@@ -57,8 +58,19 @@ namespace Pamac {
public Gtk.Stack main_stack;
[GtkChild]
Gtk.Button button_back;
[GtkChild]
Gtk.HeaderBar headerbar;
[GtkChild]
Gtk.MenuButton button_menu_global;
[GtkChild]
Gtk.MenuButton button_menu;
#if ENABLE_HAMBURGER
[GtkChild]
Gtk.ModelButton preferences_button;
#else
[GtkChild]
Gtk.ModelButton preferences_button_global;
#endif
[GtkChild]
Gtk.TreeView packages_treeview;
[GtkChild]
@@ -170,6 +182,14 @@ namespace Pamac {
public ManagerWindow (Gtk.Application application) {
Object (application: application);
#if ENABLE_HAMBURGER
headerbar.remove(button_menu_global);
button_menu.toggled.connect (on_menu_button_toggled);
#else
headerbar.remove(button_menu);
button_menu_global.toggled.connect (on_menu_button_toggled);
#endif
#if DISABLE_AUR
packages_stack.remove (aur_scrolledwindow);
packages_stackswitcher.visible = false;
@@ -1844,9 +1864,13 @@ namespace Pamac {
refresh_packages_list ();
}
[GtkCallback]
void on_menu_button_toggled () {
#if ENABLE_HAMBURGER
preferences_button.sensitive = !(transaction_running || sysupgrade_running);
#else
preferences_button_global.sensitive = !(transaction_running || sysupgrade_running);
#endif
}
[GtkCallback]
@@ -1951,6 +1975,16 @@ namespace Pamac {
"website", "http://github.com/cromnix/pamac-classic");
}
[GtkCallback]
void on_quit_button_clicked () {
//Gtk.main_quit ();
this.quit();
}
void quit() {
exit(0);
}
[GtkCallback]
void on_details_button_clicked () {
important_details = false;

6
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-classic')
cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_manager.set('PREFIX', get_option('prefix'))
cfg_pamac_manager.set('VERSION', '6.4.1')
cfg_pamac_manager.set('VERSION', '6.5.0')
cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
@@ -31,6 +31,10 @@ if ENABLE_UPDATE_ICON
pamac_manager_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_manager_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_manager_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_manager_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_manager_vala_args += ['-D', 'KDE_TRAY']
pamac_manager_c_args += ['-DKDE_TRAY']

9
src/pamac-system-daemon/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -52,6 +52,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

6
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-classic')
cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
cfg_pamac_system_daemon.set('VERSION', '6.4.1')
cfg_pamac_system_daemon.set('VERSION', '6.5.0')
cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
@@ -35,6 +35,10 @@ if ENABLE_UPDATE_ICON
pamac_system_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_system_daemon_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_system_daemon_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_system_daemon_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_system_daemon_vala_args += ['-D', 'KDE_TRAY']
pamac_system_daemon_c_args += ['-DKDE_TRAY']

9
src/pamac-tray/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -58,6 +58,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

6
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-classic')
cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_tray.set('PREFIX', get_option('prefix'))
cfg_pamac_tray.set('VERSION', '6.4.1')
cfg_pamac_tray.set('VERSION', '6.5.0')
cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
@@ -41,6 +41,10 @@ if ENABLE_UPDATE_ICON
pamac_tray_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_tray_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_tray_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_tray_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_tray_vala_args += ['-D', 'KDE_TRAY']
pamac_tray_c_args += ['-DKDE_TRAY']

9
src/pamac-user-daemon/CMakeLists.txt
View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.1")
set (VERSION "6.5.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.1")
set (VERSION "6.5.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
@@ -48,6 +48,11 @@ if (ENABLE_UPDATE_ICON)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
endif ()
if (ENABLE_HAMBURGER)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
endif ()
if (KDE_TRAY)
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )

6
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-classic')
cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
cfg_pamac_user_daemon.set('VERSION', '6.4.1')
cfg_pamac_user_daemon.set('VERSION', '6.5.0')
cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
@@ -31,6 +31,10 @@ if ENABLE_UPDATE_ICON
pamac_user_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
pamac_user_daemon_c_args += ['-DENABLE_UPDATE_ICON']
endif
if ENABLE_HAMBURGER
pamac_user_daemon_vala_args += ['-D', 'ENABLE_HAMBURGER']
pamac_user_daemon_c_args += ['-DENABLE_HAMBURGER']
endif
if KDE_TRAY
pamac_user_daemon_vala_args += ['-D', 'KDE_TRAY']
pamac_user_daemon_c_args += ['-DKDE_TRAY']

2
src/pamacclassic.pc
View File

@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
Name: pamacclassic
Description: pamacclassic
Version: 6.4.1
Version: 6.5.0
Libs: -L@DOLLAR@{libdir} -lpamacclassic
Cflags: -I@DOLLAR@{includedir}
Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0