From 9623ed0c3fde96386dc7fffeab534409f4938a74 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sun, 29 Oct 2017 17:23:58 -0300 Subject: [PATCH] change the pamac library to pamacclassic --- CMakeLists.txt | 5 +- data/dbus/CMakeLists.txt | 15 +-- data/pixmaps/CMakeLists.txt | 2 +- doc/CMakeLists.txt | 4 +- meson.build | 12 +-- meson_scripts/install_data.sh | 2 +- pamac.avprj | 48 ++++------ po/CMakeLists.txt | 4 +- po/POTFILES.in | 2 +- po/meson.build | 2 +- po/pamac.pot | 2 +- src/CMakeLists.txt | 51 +++++----- src/Config.vala.base | 2 +- src/Pamac.pc | 12 --- src/PamacUserDaemon.deps | 9 -- src/PamacUserDaemon.pc | 12 --- src/{aur => }/aur.vala | 0 src/aur/AUR.deps | 3 - src/aur/CMakeLists.txt | 122 ------------------------ src/aur/Config.vala.base | 10 -- src/aur/meson.build | 50 ---------- src/meson.build | 125 +++++++++++++------------ src/pamac-clean-cache/CMakeLists.txt | 15 +-- src/pamac-clean-cache/meson.build | 13 +-- src/pamac-install/CMakeLists.txt | 15 +-- src/pamac-install/meson.build | 13 +-- src/pamac-manager/CMakeLists.txt | 15 +-- src/pamac-manager/meson.build | 13 +-- src/pamac-system-daemon/CMakeLists.txt | 24 ++--- src/pamac-system-daemon/meson.build | 16 ++-- src/pamac-tray/CMakeLists.txt | 24 ++--- src/pamac-tray/meson.build | 16 ++-- src/pamac-user-daemon/CMakeLists.txt | 24 ++--- src/pamac-user-daemon/meson.build | 16 ++-- src/{Pamac.deps => pamacclassic.deps} | 2 + src/{aur/AUR.pc => pamacclassic.pc} | 8 +- 36 files changed, 228 insertions(+), 480 deletions(-) delete mode 100644 src/Pamac.pc delete mode 100644 src/PamacUserDaemon.deps delete mode 100644 src/PamacUserDaemon.pc rename src/{aur => }/aur.vala (100%) delete mode 100644 src/aur/AUR.deps delete mode 100644 src/aur/CMakeLists.txt delete mode 100644 src/aur/Config.vala.base delete mode 100644 src/aur/meson.build rename src/{Pamac.deps => pamacclassic.deps} (75%) rename src/{aur/AUR.pc => pamacclassic.pc} (56%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee9a62a..6ab42a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ### CMakeLists automatically created with AutoVala ### Do not edit -project (pamac) +project (pamac-classic) cmake_minimum_required (VERSION 2.6) cmake_policy (VERSION 2.8) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -65,16 +65,15 @@ add_subdirectory(data/pixmaps) add_subdirectory(data/mime) add_subdirectory(data/polkit) add_subdirectory(data/systemd) -add_subdirectory(data/dbus) add_subdirectory(data/config) add_subdirectory(data) +add_subdirectory(data/dbus) add_subdirectory(data/icons/24x24/status) add_subdirectory(data/icons/16x16/apps) add_subdirectory(data/config/noaur) add_subdirectory(data/icons/32x32/apps) add_subdirectory(data/interface) add_subdirectory(src) -add_subdirectory(src/aur) add_subdirectory(src/pamac-user-daemon) add_subdirectory(src/pamac-tray) add_subdirectory(src/pamac-clean-cache) diff --git a/data/dbus/CMakeLists.txt b/data/dbus/CMakeLists.txt index eab9070..e2f0717 100644 --- a/data/dbus/CMakeLists.txt +++ b/data/dbus/CMakeLists.txt @@ -2,21 +2,8 @@ ### Do not edit SET(DBUS_PREFIX ${CMAKE_INSTALL_PREFIX}) -IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf) - install(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf - DESTINATION - /usr/share/dbus-1/system.d - ) -ELSE() - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf - DESTINATION - /usr/share/dbus-1/system.d - ) -ENDIF() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services/) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services/) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system.d/) diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt index 1abdbcb..4a47739 100644 --- a/data/pixmaps/CMakeLists.txt +++ b/data/pixmaps/CMakeLists.txt @@ -1,4 +1,4 @@ ### CMakeLists automatically created with AutoVala ### Do not edit -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac-classic/ ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1750f02..06e63bf 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,13 +7,13 @@ foreach(file_data ${list_data}) install(DIRECTORY ${file_data} DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) ELSE() install(FILES ${file_data} DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) ENDIF() endforeach() diff --git a/meson.build b/meson.build index ce8d726..c54186a 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,10 @@ -project('pamac',['c','vala']) +project('pamac-classic',['c','vala']) DISABLE_AUR = (get_option('DISABLE_AUR') != '') ENABLE_UPDATE_ICON = (get_option('ENABLE_UPDATE_ICON') != '') KDE_TRAY = (get_option('KDE_TRAY') != '') -add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c') +add_global_arguments('-DGETTEXT_PACKAGE="pamac-classic"',language: 'c') gdk_3_0_dep = dependency('gdk-3.0') gtk_3_0_dep = dependency('gtk+-3.0') @@ -25,8 +25,6 @@ gobject_2_0_dep = dependency('gobject-2.0') subdir('po') cfg_dbus_data = configuration_data() cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix')) -meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/dbus-1/system.d',join_paths(meson.current_source_dir(),'data/dbus','org.pamac.system.conf')) - meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-system.service')) 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')) @@ -60,7 +58,7 @@ pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml']) -meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'pamac'),join_paths(meson.current_source_dir(),'data/local','','*')) +meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'),join_paths(meson.current_source_dir(),'data/local','','*')) 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','','*')) @@ -86,13 +84,13 @@ dbus_cfg_org_pamac_system_service = configure_file(input: 'data/dbus/org.pamac.s install_data(dbus_cfg_org_pamac_system_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system-services')) dbus_cfg_org_pamac_user_service = configure_file(input: 'data/dbus/org.pamac.user.service',output: 'org.pamac.user.service', configuration: cfg_dbus_data) install_data(dbus_cfg_org_pamac_user_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','services')) +install_data( 'data/dbus/org.pamac.system.conf',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system.d')) 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-generic.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-classic')) subdir('src') -subdir('src/aur') subdir('src/pamac-user-daemon') subdir('src/pamac-tray') subdir('src/pamac-clean-cache') diff --git a/meson_scripts/install_data.sh b/meson_scripts/install_data.sh index ef49c11..1972434 100755 --- a/meson_scripts/install_data.sh +++ b/meson_scripts/install_data.sh @@ -1,6 +1,6 @@ #!/bin/sh mkdir -p $DESTDIR/$1 -if [[ -d $2 ]]; then +if [ -d "$2" ]; then cp -a $2/* $DESTDIR/$1 else cp -a $2 $DESTDIR/$1 diff --git a/pamac.avprj b/pamac.avprj index c6a07b7..c5c2d87 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -1,9 +1,8 @@ ### AutoVala Project ### autovala_version: 26 -project_name: pamac +project_name: pamac-classic vala_version: 0.38 -custom: data/dbus/org.pamac.system.conf /usr/share/dbus-1/system.d custom: data/systemd/pamac-system.service /usr/lib/systemd/system custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system @@ -29,9 +28,10 @@ vapidir: src/vapis vala_binary: src/pamac-clean-cache/pamac-clean-cache version: 6.3.5 -vala_local_package: Pamac +vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 +vala_check_package: json-glib-1.0 *vala_check_package: gio-2.0 *vala_check_package: glib-2.0 *vala_check_package: gobject-2.0 @@ -41,8 +41,9 @@ vala_check_package: gtk+-3.0 vala_binary: src/pamac-install/pamac-install version: 6.3.5 use_gresource: pamac_installer_gresource_xml -vala_local_package: Pamac +vala_local_package: pamacclassic vala_check_package: gtk+-3.0 +vala_check_package: json-glib-1.0 *vala_check_package: gio-2.0 *vala_check_package: glib-2.0 *vala_check_package: gobject-2.0 @@ -53,8 +54,9 @@ vala_binary: src/pamac-manager/pamac-manager version: 6.3.5 alias: pamac-updater use_gresource: pamac_manager_gresource_xml -vala_local_package: Pamac +vala_local_package: pamacclassic vala_check_package: gtk+-3.0 +vala_check_package: json-glib-1.0 *vala_check_package: gio-2.0 *vala_check_package: glib-2.0 *vala_check_package: gobject-2.0 @@ -64,10 +66,7 @@ vala_check_package: gtk+-3.0 vala_binary: src/pamac-system-daemon/pamac-system-daemon version: 6.3.5 -vala_local_package: Pamac -if NOT DISABLE_AUR -vala_local_package: AUR -end +vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 vala_check_package: json-glib-1.0 @@ -85,10 +84,7 @@ vala_check_package: polkit-gobject-1 vala_binary: src/pamac-tray/pamac-tray version: 6.3.5 -vala_local_package: Pamac -if NOT DISABLE_AUR -vala_local_package: AUR -end +vala_local_package: pamacclassic vala_package: posix vala_check_package: json-glib-1.0 vala_check_package: libalpm @@ -112,10 +108,7 @@ end vala_binary: src/pamac-user-daemon/pamac-user-daemon version: 6.3.5 -vala_local_package: Pamac -if NOT DISABLE_AUR -vala_local_package: AUR -end +vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 vala_check_package: json-glib-1.0 @@ -128,20 +121,25 @@ vala_check_package: libsoup-2.4 *vala_source: user_daemon.vala -vala_library: src/pamac +vala_library: src/pamac-classic version: 6.3.5 -*namespace: Pamac +namespace: pamacclassic use_gresource: pamac_transaction_gresource_xml vala_package: posix vala_check_package: gdk-3.0 vala_check_package: gtk+-3.0 +vala_check_package: json-glib-1.0 vala_check_package: libalpm vala_check_package: libnotify +vala_check_package: libsoup-2.4 vala_check_package: vte-2.91 *vala_check_package: gio-2.0 *vala_check_package: glib-2.0 *vala_check_package: gobject-2.0 *c_library: m +if NOT DISABLE_AUR +vala_source: aur.vala +end *vala_source: alpm_config.vala *vala_source: choose_ignorepkgs_dialog.vala *vala_source: choose_provider_dialog.vala @@ -154,14 +152,6 @@ vala_check_package: vte-2.91 *vala_source: transaction.vala *vala_source: transaction_sum_dialog.vala -vala_library: src/aur/aur -version: 6.3.5 -*namespace: AUR -vala_check_package: json-glib-1.0 -vala_check_package: libsoup-2.4 -*vala_check_package: glib-2.0 -*vala_source: aur.vala - *po: po @@ -174,7 +164,7 @@ vala_check_package: libsoup-2.4 *translate: glade data/interface/progress_dialog.ui *translate: glade data/interface/transaction_sum_dialog.ui *translate: vala src/alpm_config.vala -*translate: vala src/aur/aur.vala +*translate: vala src/aur.vala *translate: vala src/choose_ignorepkgs_dialog.vala *translate: vala src/choose_provider_dialog.vala *translate: vala src/common.vala @@ -223,6 +213,8 @@ end *dbus_system_service: data/dbus/org.pamac.system.service *dbus_service: data/dbus/org.pamac.user.service +*dbus_config: data/dbus/org.pamac.system.conf + *full_icon: Hicolor Applications data/icons/16x16/apps/system-software-install.png *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-no-update.png *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-update.png diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index a3346eb..f4b8d38 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -2,5 +2,5 @@ ### Do not edit include (Translations) -add_translations_directory("pamac") -add_translations_catalog("pamac" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../src/aur ../data/interface ) +add_translations_directory("pamac-classic") +add_translations_catalog("pamac-classic" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../data/interface ) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3a31a0b..b84f594 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -16,6 +16,7 @@ src/pamac-tray/pamac_config.vala src/pamac-tray/tray.vala src/pamac-user-daemon/alpm_config.vala src/pamac-user-daemon/user_daemon.vala +src/aur.vala src/alpm_config.vala src/choose_ignorepkgs_dialog.vala src/choose_provider_dialog.vala @@ -27,7 +28,6 @@ src/preferences_dialog.vala src/progress_box.vala src/transaction.vala src/transaction_sum_dialog.vala -src/aur/aur.vala data/interface/choose_ignorepkgs_dialog.ui data/interface/choose_provider_dialog.ui data/interface/history_dialog.ui diff --git a/po/meson.build b/po/meson.build index 3fe769a..2a80044 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,2 +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', 'es', '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_419', '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', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ']) +i18n.gettext('pamac-classic', 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', 'es', '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_419', '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', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ']) diff --git a/po/pamac.pot b/po/pamac.pot index 59274b7..66ada0b 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: cromer@cromnix.org\n" -"POT-Creation-Date: 2017-10-29 15:17-0300\n" +"POT-Creation-Date: 2017-10-29 17:22-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5907870..987c288 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -13,8 +13,8 @@ set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src/Config.vala) 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) +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.3.5") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) @@ -27,14 +27,19 @@ include (ValaPrecompile) set (VALA_PACKAGES ${VALA_PACKAGES} posix) set (VALA_PACKAGES ${VALA_PACKAGES} gdk-3.0) set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0) +set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0) set (VALA_PACKAGES ${VALA_PACKAGES} libalpm) set (VALA_PACKAGES ${VALA_PACKAGES} libnotify) +set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4) set (VALA_PACKAGES ${VALA_PACKAGES} vte-2.91) set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0) set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) +if (NOT DISABLE_AUR) + set (APP_SOURCES ${APP_SOURCES} aur.vala) +endif () set (APP_SOURCES ${APP_SOURCES} alpm_config.vala) set (APP_SOURCES ${APP_SOURCES} choose_ignorepkgs_dialog.vala) set (APP_SOURCES ${APP_SOURCES} choose_provider_dialog.vala) @@ -68,28 +73,28 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g") endif() -set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=Pamac --gir Pamac-6.0.gir ) +set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-6.0.gir ) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml ) -vala_precompile(VALA_C Pamac +vala_precompile(VALA_C pamacclassic ${APP_SOURCES} PACKAGES ${VALA_PACKAGES} OPTIONS ${COMPILE_OPTIONS} GENERATE_VAPI - Pamac + pamacclassic GENERATE_HEADER - Pamac + pamacclassic ) SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE}) -add_library(Pamac SHARED ${VALA_C}) +add_library(pamacclassic SHARED ${VALA_C}) -set ( Pamac_DEPENDENCIES ${Pamac_DEPENDENCIES} pamac_transaction_gresource_xml ) -add_dependencies( Pamac ${Pamac_DEPENDENCIES} ) -target_link_libraries( Pamac m ) -set_target_properties( Pamac PROPERTIES +set ( pamacclassic_DEPENDENCIES ${pamacclassic_DEPENDENCIES} pamac_transaction_gresource_xml ) +add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} ) +target_link_libraries( pamacclassic m ) +set_target_properties( pamacclassic PROPERTIES VERSION 6.3.5 SOVERSION @@ -97,38 +102,38 @@ SOVERSION install(TARGETS - Pamac + pamacclassic LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/ ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Pamac.h + ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Pamac.vapi + ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.vapi DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps + ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Pamac-6.0.gir + ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/ ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc + ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ ) if(HAVE_VALADOC) - valadoc(Pamac - ${CMAKE_BINARY_DIR}/valadoc/Pamac + valadoc(pamacclassic + ${CMAKE_BINARY_DIR}/valadoc/pamacclassic ${APP_SOURCES} PACKAGES ${VALA_PACKAGES} @@ -138,7 +143,7 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/Config.vala.base b/src/Config.vala.base index c57c9c4..4f317a8 100644 --- a/src/Config.vala.base +++ b/src/Config.vala.base @@ -1,4 +1,4 @@ -namespace PamacConstants { +namespace pamacclassicConstants { public const string DATADIR = "@DATADIR@"; public const string PKGDATADIR = "@PKGDATADIR@"; public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; diff --git a/src/Pamac.pc b/src/Pamac.pc deleted file mode 100644 index 0956bae..0000000 --- a/src/Pamac.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -real_prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@DOLLAR@{prefix} -libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} -includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} - -Name: Pamac -Description: Pamac -Version: 6.3.5 -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 diff --git a/src/PamacUserDaemon.deps b/src/PamacUserDaemon.deps deleted file mode 100644 index a345ae5..0000000 --- a/src/PamacUserDaemon.deps +++ /dev/null @@ -1,9 +0,0 @@ -posix -gdk-3.0 -gtk+-3.0 -libalpm -libnotify -vte-2.91 -gio-2.0 -glib-2.0 -gobject-2.0 diff --git a/src/PamacUserDaemon.pc b/src/PamacUserDaemon.pc deleted file mode 100644 index 736265f..0000000 --- a/src/PamacUserDaemon.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -real_prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@DOLLAR@{prefix} -libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} -includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} - -Name: PamacUserDaemon -Description: PamacUserDaemon -Version: 5.2.1 -Libs: -L@DOLLAR@{libdir} -lPamacUserDaemon -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 diff --git a/src/aur/aur.vala b/src/aur.vala similarity index 100% rename from src/aur/aur.vala rename to src/aur.vala diff --git a/src/aur/AUR.deps b/src/aur/AUR.deps deleted file mode 100644 index 6c584d7..0000000 --- a/src/aur/AUR.deps +++ /dev/null @@ -1,3 +0,0 @@ -json-glib-1.0 -libsoup-2.4 -glib-2.0 diff --git a/src/aur/CMakeLists.txt b/src/aur/CMakeLists.txt deleted file mode 100644 index 3ac773a..0000000 --- a/src/aur/CMakeLists.txt +++ /dev/null @@ -1,122 +0,0 @@ -### CMakeLists automatically created with AutoVala -### Do not edit - -set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") -set (CMAKE_C_FLAGS "") -set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.3.5") -set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") -set (DOLLAR "$") - -configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR}/src/aur/Config.vala) -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.3.5") -add_definitions (${DEPS_CFLAGS}) -link_libraries ( ${DEPS_LIBRARIES} ) -link_directories ( ${DEPS_LIBRARY_DIRS} ) -find_package (Vala REQUIRED) -include (ValaVersion) -ensure_vala_version ("0.38" MINIMUM) -include (ValaPrecompile) - -set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0) -set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4) -set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) - -set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) -set (APP_SOURCES ${APP_SOURCES} aur.vala) - -if (DISABLE_AUR) - set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " ) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " ) -endif () -if (ENABLE_UPDATE_ICON) - set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " ) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " ) -endif () -if (KDE_TRAY) - set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " ) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " ) -endif () -set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis ) - -if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")) - set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g") -endif() - -set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=AUR --gir AUR-6.0.gir ) - -vala_precompile(VALA_C AUR - ${APP_SOURCES} -PACKAGES - ${VALA_PACKAGES} -OPTIONS - ${COMPILE_OPTIONS} -GENERATE_VAPI - AUR -GENERATE_HEADER - AUR -) - -add_library(AUR SHARED ${VALA_C}) - -set_target_properties( AUR PROPERTIES -VERSION - 6.3.5 -SOVERSION - 6 ) - - -install(TARGETS - AUR -LIBRARY DESTINATION - ${CMAKE_INSTALL_LIBDIR}/ -) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUR.h -DESTINATION - ${CMAKE_INSTALL_INCLUDEDIR}/ -) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUR.vapi -DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ -) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps -DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ -) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUR-6.0.gir -DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/ -) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc -DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ -) -if(HAVE_VALADOC) - valadoc(AUR - ${CMAKE_BINARY_DIR}/valadoc/AUR - ${APP_SOURCES} - PACKAGES - ${VALA_PACKAGES} - CUSTOM_VAPIS - ${CUSTOM_VAPIS_LIST} - ) - install(DIRECTORY - ${CMAKE_BINARY_DIR}/valadoc - DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac - ) -endif() diff --git a/src/aur/Config.vala.base b/src/aur/Config.vala.base deleted file mode 100644 index 7fb47c1..0000000 --- a/src/aur/Config.vala.base +++ /dev/null @@ -1,10 +0,0 @@ -namespace AURConstants { - public const string DATADIR = "@DATADIR@"; - public const string PKGDATADIR = "@PKGDATADIR@"; - public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; - public const string RELEASE_NAME = "@RELEASE_NAME@"; - public const string VERSION = "@VERSION@"; -#if UNITEST - public const string TESTSRCDIR = "@TESTSRCDIR@"; -#endif -} diff --git a/src/aur/meson.build b/src/aur/meson.build deleted file mode 100644 index 6918b36..0000000 --- a/src/aur/meson.build +++ /dev/null @@ -1,50 +0,0 @@ -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.3.5') -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 ENABLE_UPDATE_ICON - aur_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] - aur_c_args += ['-DENABLE_UPDATE_ICON'] -endif -if KDE_TRAY - aur_vala_args += ['-D', 'KDE_TRAY'] - aur_c_args += ['-DKDE_TRAY'] -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.3.5',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.3.5', - 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') - diff --git a/src/meson.build b/src/meson.build index f1a1d0b..14b2282 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,74 +1,81 @@ -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.3.5') -cfg_pamac.set('TESTSRCDIR', meson.source_root()) +cfg_pamac_classic = configuration_data() +cfg_pamac_classic.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir'))) +cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') +cfg_pamac_classic.set('TESTSRCDIR', meson.source_root()) -cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac) +cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic) -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'] -pamac_sources += [pamac_transaction_gresource_xml_file_c] -pamac_vala_args = ['--pkg','posix'] -pamac_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')] -pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')] -pamac_c_args = [] +pamac_classic_deps = [gdk_3_0_dep] +pamac_classic_deps += [gtk_3_0_dep] +pamac_classic_deps += [json_glib_1_0_dep] +pamac_classic_deps += [libalpm_dep] +pamac_classic_deps += [libnotify_dep] +pamac_classic_deps += [libsoup_2_4_dep] +pamac_classic_deps += [vte_2_91_dep] +pamac_classic_deps += [gio_2_0_dep] +pamac_classic_deps += [glib_2_0_dep] +pamac_classic_deps += [gobject_2_0_dep] +pamac_classic_sources = [cfgfile_1] +if not DISABLE_AUR +pamac_classic_sources += ['aur.vala'] +endif +pamac_classic_sources += ['alpm_config.vala'] +pamac_classic_sources += ['choose_ignorepkgs_dialog.vala'] +pamac_classic_sources += ['choose_provider_dialog.vala'] +pamac_classic_sources += ['common.vala'] +pamac_classic_sources += ['mirrors_config.vala'] +pamac_classic_sources += ['package.vala'] +pamac_classic_sources += ['pamac_config.vala'] +pamac_classic_sources += ['preferences_dialog.vala'] +pamac_classic_sources += ['progress_box.vala'] +pamac_classic_sources += ['transaction.vala'] +pamac_classic_sources += ['transaction_sum_dialog.vala'] +pamac_classic_sources += [pamac_transaction_gresource_xml_file_c] +pamac_classic_vala_args = ['--pkg','posix'] +pamac_classic_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')] +pamac_classic_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')] +pamac_classic_c_args = [] if DISABLE_AUR - pamac_vala_args += ['-D', 'DISABLE_AUR'] - pamac_c_args += ['-DDISABLE_AUR'] + pamac_classic_vala_args += ['-D', 'DISABLE_AUR'] + pamac_classic_c_args += ['-DDISABLE_AUR'] endif if ENABLE_UPDATE_ICON - pamac_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] - pamac_c_args += ['-DENABLE_UPDATE_ICON'] + pamac_classic_vala_args += ['-D', 'ENABLE_UPDATE_ICON'] + pamac_classic_c_args += ['-DENABLE_UPDATE_ICON'] endif if KDE_TRAY - pamac_vala_args += ['-D', 'KDE_TRAY'] - pamac_c_args += ['-DKDE_TRAY'] + pamac_classic_vala_args += ['-D', 'KDE_TRAY'] + pamac_classic_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_classic_deps += [meson.get_compiler('c').find_library('m', required : false)] +pamac_classic_vala_args += ['--gir=pamacclassic-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.3.5',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.3.5',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'] +pamac_classic_requires = [] +pamac_classic_requires += ['gdk-3.0'] +pamac_classic_requires += ['gtk+-3.0'] +pamac_classic_requires += ['json-glib-1.0'] +pamac_classic_requires += ['libalpm'] +pamac_classic_requires += ['libnotify'] +pamac_classic_requires += ['libsoup-2.4'] +pamac_classic_requires += ['vte-2.91'] +pamac_classic_requires += ['gio-2.0'] +pamac_classic_requires += ['glib-2.0'] +pamac_classic_requires += ['gobject-2.0'] pkg_mod = import('pkgconfig') -pkg_mod.generate(libraries : Pamac_library, +pkg_mod.generate(libraries : pamacclassic_library, version : '6.3.5', - name : 'Pamac', - filebase : 'Pamac', - description : 'Pamac', - requires : pamac_requires) + name : 'pamacclassic', + filebase : 'pamacclassic', + description : 'pamacclassic', + requires : pamac_classic_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') +install_data(join_paths(meson.current_source_dir(),'pamacclassic.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','pamacclassic','pamacclassic-6.0.gir') diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 72eeb57..eb40ad1 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -16,7 +16,7 @@ add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) @@ -25,6 +25,7 @@ include (ValaPrecompile) set (VALA_PACKAGES ${VALA_PACKAGES} posix) set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0) +set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0) set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0) @@ -33,7 +34,7 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) set (APP_SOURCES ${APP_SOURCES} clean_cache.vala) set (APP_SOURCES ${APP_SOURCES} pamac_config.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -68,7 +69,7 @@ OPTIONS ) add_executable(pamac-clean-cache ${VALA_C}) -set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} Pamac ) +set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-clean-cache ${pamac-clean-cache_DEPENDENCIES} ) @@ -89,6 +90,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index f498e56..7e36cfa 100644 --- a/src/pamac-clean-cache/meson.build +++ b/src/pamac-clean-cache/meson.build @@ -1,24 +1,25 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') 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) +cfgfile_4 = 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 += [json_glib_1_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 = [cfgfile_4] 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_dependencies = [pamacclassic_library] pamac_clean_cache_c_args = [] if DISABLE_AUR pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR'] diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index 4591f9b..7854e79 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -16,7 +16,7 @@ add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) @@ -24,6 +24,7 @@ ensure_vala_version ("0.38" MINIMUM) include (ValaPrecompile) set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0) +set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0) set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0) @@ -32,7 +33,7 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) set (APP_SOURCES ${APP_SOURCES} installer.vala) set (APP_SOURCES ${APP_SOURCES} progress_dialog.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -70,7 +71,7 @@ OPTIONS SET (VALA_C ${VALA_C} ${pamac_installer_gresource_xml_C_FILE}) add_executable(pamac-install ${VALA_C}) set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamac_installer_gresource_xml ) -set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} Pamac ) +set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-install ${pamac-install_DEPENDENCIES} ) @@ -91,6 +92,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index b75b67d..71ac618 100644 --- a/src/pamac-install/meson.build +++ b/src/pamac-install/meson.build @@ -1,25 +1,26 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) -cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install) +cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install) pamac_install_deps = [gtk_3_0_dep] +pamac_install_deps += [json_glib_1_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 = [cfgfile_5] 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_dependencies = [pamacclassic_library] pamac_install_c_args = [] if DISABLE_AUR pamac_install_vala_args += ['-D', 'DISABLE_AUR'] diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index 7319f40..06a342c 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -16,7 +16,7 @@ add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) @@ -24,6 +24,7 @@ ensure_vala_version ("0.38" MINIMUM) include (ValaPrecompile) set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0) +set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0) set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0) @@ -33,7 +34,7 @@ set (APP_SOURCES ${APP_SOURCES} history_dialog.vala) set (APP_SOURCES ${APP_SOURCES} manager.vala) set (APP_SOURCES ${APP_SOURCES} manager_window.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -71,7 +72,7 @@ OPTIONS SET (VALA_C ${VALA_C} ${pamac_manager_gresource_xml_C_FILE}) add_executable(pamac-manager ${VALA_C}) set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamac_manager_gresource_xml ) -set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} Pamac ) +set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-manager ${pamac-manager_DEPENDENCIES} ) @@ -98,6 +99,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index e7c3c2d..2df05b4 100644 --- a/src/pamac-manager/meson.build +++ b/src/pamac-manager/meson.build @@ -1,26 +1,27 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) -cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) +cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) pamac_manager_deps = [gtk_3_0_dep] +pamac_manager_deps += [json_glib_1_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 = [cfgfile_6] pamac_manager_sources += ['history_dialog.vala'] pamac_manager_sources += ['manager.vala'] pamac_manager_sources += ['manager_window.vala'] pamac_manager_sources += [pamac_manager_gresource_xml_file_c] pamac_manager_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')] pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager.gresource.xml')] -pamac_manager_dependencies = [Pamac_library] +pamac_manager_dependencies = [pamacclassic_library] pamac_manager_c_args = [] if DISABLE_AUR pamac_manager_vala_args += ['-D', 'DISABLE_AUR'] diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 47715f8..98c11ce 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -15,9 +15,9 @@ configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${C add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) -include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) -link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +include_directories ( ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) ensure_vala_version ("0.38" MINIMUM) @@ -40,10 +40,7 @@ set (APP_SOURCES ${APP_SOURCES} mirrors_config.vala) set (APP_SOURCES ${APP_SOURCES} pamac_config.vala) set (APP_SOURCES ${APP_SOURCES} system_daemon.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) -if (NOT DISABLE_AUR) - set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) -endif () +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -78,10 +75,7 @@ OPTIONS ) add_executable(pamac-system-daemon ${VALA_C}) -set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} Pamac ) -if (NOT DISABLE_AUR) - set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} AUR ) -endif () +set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-system-daemon ${pamac-system-daemon_DEPENDENCIES} ) @@ -102,6 +96,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index cb68890..c779907 100644 --- a/src/pamac-system-daemon/meson.build +++ b/src/pamac-system-daemon/meson.build @@ -1,13 +1,13 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') 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) +cfgfile_7 = 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] @@ -18,17 +18,14 @@ 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 = [cfgfile_7] 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_dependencies = [pamacclassic_library] pamac_system_daemon_c_args = [] if DISABLE_AUR pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR'] @@ -43,7 +40,6 @@ if 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) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index 5f0f925..2deb5ae 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -15,9 +15,9 @@ configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINA add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) -include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) -link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +include_directories ( ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) ensure_vala_version ("0.38" MINIMUM) @@ -46,10 +46,7 @@ set (APP_SOURCES ${APP_SOURCES} alpm_config.vala) set (APP_SOURCES ${APP_SOURCES} pamac_config.vala) set (APP_SOURCES ${APP_SOURCES} tray.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) -if (NOT DISABLE_AUR) - set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) -endif () +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -84,10 +81,7 @@ OPTIONS ) add_executable(pamac-tray ${VALA_C}) -set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} Pamac ) -if (NOT DISABLE_AUR) - set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} AUR ) -endif () +set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-tray ${pamac-tray_DEPENDENCIES} ) @@ -108,6 +102,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index 2b13a9f..fe747aa 100644 --- a/src/pamac-tray/meson.build +++ b/src/pamac-tray/meson.build @@ -1,13 +1,13 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) -cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray) +cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray) pamac_tray_deps = [json_glib_1_0_dep] pamac_tray_deps += [libalpm_dep] @@ -20,7 +20,7 @@ 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] +pamac_tray_sources = [cfgfile_3] if KDE_TRAY pamac_tray_sources += ['tray-appindicator.vala'] else @@ -31,10 +31,7 @@ pamac_tray_sources += ['pamac_config.vala'] pamac_tray_sources += ['tray.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_dependencies = [pamacclassic_library] pamac_tray_c_args = [] if DISABLE_AUR pamac_tray_vala_args += ['-D', 'DISABLE_AUR'] @@ -49,7 +46,6 @@ if 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) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index 607f734..02c787b 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -2,9 +2,9 @@ ### Do not edit set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}") -set (PKGDATADIR "${DATADIR}/pamac") -set (GETTEXT_PACKAGE "pamac") -set (RELEASE_NAME "pamac") +set (PKGDATADIR "${DATADIR}/pamac-classic") +set (GETTEXT_PACKAGE "pamac-classic") +set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (VERSION "6.3.5") @@ -15,9 +15,9 @@ configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMA add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") set (VERSION "6.3.5") add_definitions (${DEPS_CFLAGS}) -include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) -link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) -link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +include_directories ( ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ) find_package (Vala REQUIRED) include (ValaVersion) ensure_vala_version ("0.38" MINIMUM) @@ -36,10 +36,7 @@ set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) set (APP_SOURCES ${APP_SOURCES} alpm_config.vala) set (APP_SOURCES ${APP_SOURCES} user_daemon.vala) -set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) -if (NOT DISABLE_AUR) - set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) -endif () +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi) if (DISABLE_AUR) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR) @@ -74,10 +71,7 @@ OPTIONS ) add_executable(pamac-user-daemon ${VALA_C}) -set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} Pamac ) -if (NOT DISABLE_AUR) - set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} AUR ) -endif () +set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} pamacclassic ) add_dependencies( pamac-user-daemon ${pamac-user-daemon_DEPENDENCIES} ) @@ -98,6 +92,6 @@ if(HAVE_VALADOC) install(DIRECTORY ${CMAKE_BINARY_DIR}/valadoc DESTINATION - ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic ) endif() diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index b95ecfd..572129a 100644 --- a/src/pamac-user-daemon/meson.build +++ b/src/pamac-user-daemon/meson.build @@ -1,13 +1,13 @@ 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('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic')) +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.3.5') 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) +cfgfile_2 = 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] @@ -16,15 +16,12 @@ 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 = [cfgfile_2] 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_dependencies = [pamacclassic_library] pamac_user_daemon_c_args = [] if DISABLE_AUR pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR'] @@ -39,7 +36,6 @@ if 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) diff --git a/src/Pamac.deps b/src/pamacclassic.deps similarity index 75% rename from src/Pamac.deps rename to src/pamacclassic.deps index a345ae5..280bc7a 100644 --- a/src/Pamac.deps +++ b/src/pamacclassic.deps @@ -1,8 +1,10 @@ posix gdk-3.0 gtk+-3.0 +json-glib-1.0 libalpm libnotify +libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 diff --git a/src/aur/AUR.pc b/src/pamacclassic.pc similarity index 56% rename from src/aur/AUR.pc rename to src/pamacclassic.pc index 524d91b..5aaedaf 100644 --- a/src/aur/AUR.pc +++ b/src/pamacclassic.pc @@ -4,9 +4,9 @@ exec_prefix=@DOLLAR@{prefix} libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} -Name: AUR -Description: AUR +Name: pamacclassic +Description: pamacclassic Version: 6.3.5 -Libs: -L@DOLLAR@{libdir} -lAUR +Libs: -L@DOLLAR@{libdir} -lpamacclassic Cflags: -I@DOLLAR@{includedir} -Requires: json-glib-1.0 libsoup-2.4 glib-2.0 +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