From cc52ac1ce84a75d6a7ebb6ebc54a400abddc08d7 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 11 Oct 2017 19:16:07 -0300 Subject: [PATCH] fix missing cmake flag with configure wrapper --- .configure-custom.sh | 3 ++- autovala/configure-custom.sh | 3 ++- pamac.avprj | 14 +++++++------- src/CMakeLists.txt | 6 +++--- src/Pamac.pc | 2 +- src/aur/AUR.pc | 2 +- src/aur/CMakeLists.txt | 6 +++--- src/pamac-install/CMakeLists.txt | 4 ++-- src/pamac-manager/CMakeLists.txt | 4 ++-- src/pamac-system-daemon/CMakeLists.txt | 4 ++-- src/pamac-tray/CMakeLists.txt | 4 ++-- src/pamac-user-daemon/CMakeLists.txt | 4 ++-- 12 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.configure-custom.sh b/.configure-custom.sh index b1af833..c65be3b 100644 --- a/.configure-custom.sh +++ b/.configure-custom.sh @@ -2,5 +2,6 @@ ENABLE_VARS="kde-tray|ON|KDE_TRAY" ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" -DISABLE_VARS="aur|ON|DISABLE_AUR" +DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE" DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" +DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing" diff --git a/autovala/configure-custom.sh b/autovala/configure-custom.sh index b1af833..c65be3b 100644 --- a/autovala/configure-custom.sh +++ b/autovala/configure-custom.sh @@ -2,5 +2,6 @@ ENABLE_VARS="kde-tray|ON|KDE_TRAY" ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" -DISABLE_VARS="aur|ON|DISABLE_AUR" +DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE" DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" +DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing" diff --git a/pamac.avprj b/pamac.avprj index 7f807d7..d6cd8b0 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -34,7 +34,7 @@ end vapidir: src/vapis vala_binary: src/pamac-install/pamac-install -version: 6.0.0 +version: 6.0.1 use_gresource: pamac_installer_gresource_xml vala_local_package: Pamac vala_check_package: gtk+-3.0 @@ -45,7 +45,7 @@ vala_check_package: gtk+-3.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -version: 6.0.0 +version: 6.0.1 use_gresource: pamac_manager_gresource_xml vala_local_package: Pamac vala_check_package: gtk+-3.0 @@ -57,7 +57,7 @@ vala_check_package: gtk+-3.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -version: 6.0.0 +version: 6.0.1 vala_local_package: Pamac if NOT DISABLE_AUR vala_local_package: AUR @@ -78,7 +78,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -version: 6.0.0 +version: 6.0.1 vala_local_package: Pamac if NOT DISABLE_AUR vala_local_package: AUR @@ -104,7 +104,7 @@ end *vala_source: user_daemon.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -version: 6.0.0 +version: 6.0.1 vala_local_package: AUR vala_local_package: Pamac vala_package: posix @@ -120,7 +120,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac -version: 6.0.0 +version: 6.0.1 *namespace: Pamac use_gresource: pamac_transaction_gresource_xml vala_package: posix @@ -145,7 +145,7 @@ vala_check_package: vte-2.91 *vala_source: transaction_sum_dialog.vala vala_library: src/aur/aur -version: 6.0.0 +version: 6.0.1 *namespace: AUR vala_check_package: json-glib-1.0 vala_check_package: libsoup-2.4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 768b146..8890eb1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -85,7 +85,7 @@ add_library(Pamac SHARED ${VALA_C}) add_dependencies (Pamac pamac_transaction_gresource_xml) set_target_properties( Pamac PROPERTIES VERSION - 6.0.0 + 6.0.1 SOVERSION 6 ) diff --git a/src/Pamac.pc b/src/Pamac.pc index 1b9f8f3..36953d5 100644 --- a/src/Pamac.pc +++ b/src/Pamac.pc @@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: Pamac Description: Pamac -Version: 6.0.0 +Version: 6.0.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 diff --git a/src/aur/AUR.pc b/src/aur/AUR.pc index b8bb804..ff0f361 100644 --- a/src/aur/AUR.pc +++ b/src/aur/AUR.pc @@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: AUR Description: AUR -Version: 6.0.0 +Version: 6.0.1 Libs: -L@DOLLAR@{libdir} -lAUR Cflags: -I@DOLLAR@{includedir} Requires: json-glib-1.0 libsoup-2.4 glib-2.0 diff --git a/src/aur/CMakeLists.txt b/src/aur/CMakeLists.txt index 015ad21..371c93d 100644 --- a/src/aur/CMakeLists.txt +++ b/src/aur/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.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.0.0 + 6.0.1 SOVERSION 6 ) diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index d177538..9c54d84 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lPamac ) diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index 134e503..ce657af 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lPamac ) diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 60d200e..801e80e 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index c93df2d..91bdf8f 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index a340b7a..1d561e3 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.0.0") +set (VERSION "6.0.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.0.0") +set (VERSION "6.0.1") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac )