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

fix missing cmake flag with configure wrapper

Browse Source
This commit is contained in:
Chris Cromer 2017-10-11 19:16:07 -03:00
parent 914c939ee9
commit cc52ac1ce8
12 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.configure-custom.sh
View File

@ -2,5 +2,6 @@
ENABLE_VARS="kde-tray|ON|KDE_TRAY" ENABLE_VARS="kde-tray|ON|KDE_TRAY"
ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 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_DISABLE_AUR_DOC="disable the AUR in pamac"
DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"

3
autovala/configure-custom.sh
View File

@ -2,5 +2,6 @@
ENABLE_VARS="kde-tray|ON|KDE_TRAY" ENABLE_VARS="kde-tray|ON|KDE_TRAY"
ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 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_DISABLE_AUR_DOC="disable the AUR in pamac"
DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"

14
pamac.avprj
View File

@ -34,7 +34,7 @@ end
vapidir: src/vapis vapidir: src/vapis
vala_binary: src/pamac-install/pamac-install vala_binary: src/pamac-install/pamac-install
version: 6.0.0 version: 6.0.1
use_gresource: pamac_installer_gresource_xml use_gresource: pamac_installer_gresource_xml
vala_local_package: Pamac vala_local_package: Pamac
vala_check_package: gtk+-3.0 vala_check_package: gtk+-3.0
@ -45,7 +45,7 @@ vala_check_package: gtk+-3.0
*vala_source: progress_dialog.vala *vala_source: progress_dialog.vala
vala_binary: src/pamac-manager/pamac-manager vala_binary: src/pamac-manager/pamac-manager
version: 6.0.0 version: 6.0.1
use_gresource: pamac_manager_gresource_xml use_gresource: pamac_manager_gresource_xml
vala_local_package: Pamac vala_local_package: Pamac
vala_check_package: gtk+-3.0 vala_check_package: gtk+-3.0
@ -57,7 +57,7 @@ vala_check_package: gtk+-3.0
*vala_source: manager_window.vala *vala_source: manager_window.vala
vala_binary: src/pamac-system-daemon/pamac-system-daemon vala_binary: src/pamac-system-daemon/pamac-system-daemon
version: 6.0.0 version: 6.0.1
vala_local_package: Pamac vala_local_package: Pamac
if NOT DISABLE_AUR if NOT DISABLE_AUR
vala_local_package: AUR vala_local_package: AUR
@ -78,7 +78,7 @@ vala_check_package: polkit-gobject-1
*vala_source: system_daemon.vala *vala_source: system_daemon.vala
vala_binary: src/pamac-tray/pamac-tray vala_binary: src/pamac-tray/pamac-tray
version: 6.0.0 version: 6.0.1
vala_local_package: Pamac vala_local_package: Pamac
if NOT DISABLE_AUR if NOT DISABLE_AUR
vala_local_package: AUR vala_local_package: AUR
@ -104,7 +104,7 @@ end
*vala_source: user_daemon.vala *vala_source: user_daemon.vala
vala_binary: src/pamac-user-daemon/pamac-user-daemon vala_binary: src/pamac-user-daemon/pamac-user-daemon
version: 6.0.0 version: 6.0.1
vala_local_package: AUR vala_local_package: AUR
vala_local_package: Pamac vala_local_package: Pamac
vala_package: posix vala_package: posix
@ -120,7 +120,7 @@ vala_check_package: libsoup-2.4
vala_library: src/pamac vala_library: src/pamac
version: 6.0.0 version: 6.0.1
*namespace: Pamac *namespace: Pamac
use_gresource: pamac_transaction_gresource_xml use_gresource: pamac_transaction_gresource_xml
vala_package: posix vala_package: posix
@ -145,7 +145,7 @@ vala_check_package: vte-2.91
*vala_source: transaction_sum_dialog.vala *vala_source: transaction_sum_dialog.vala
vala_library: src/aur/aur vala_library: src/aur/aur
version: 6.0.0 version: 6.0.1
*namespace: AUR *namespace: AUR
vala_check_package: json-glib-1.0 vala_check_package: json-glib-1.0
vala_check_package: libsoup-2.4 vala_check_package: libsoup-2.4

6
src/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") 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}\") 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.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}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps)
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} ) link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} ) link_directories ( ${DEPS_LIBRARY_DIRS} )
@ -85,7 +85,7 @@ add_library(Pamac SHARED ${VALA_C})
add_dependencies (Pamac pamac_transaction_gresource_xml) add_dependencies (Pamac pamac_transaction_gresource_xml)
set_target_properties( Pamac PROPERTIES set_target_properties( Pamac PROPERTIES
VERSION VERSION
6.0.0 6.0.1
SOVERSION SOVERSION
6 ) 6 )

2
src/Pamac.pc
View File

@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
Name: Pamac Name: Pamac
Description: Pamac Description: Pamac
Version: 6.0.0 Version: 6.0.1
Libs: -L@DOLLAR@{libdir} -lPamac Libs: -L@DOLLAR@{libdir} -lPamac
Cflags: -I@DOLLAR@{includedir} 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 Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0

2
src/aur/AUR.pc
View File

@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
Name: AUR Name: AUR
Description: AUR Description: AUR
Version: 6.0.0 Version: 6.0.1
Libs: -L@DOLLAR@{libdir} -lAUR Libs: -L@DOLLAR@{libdir} -lAUR
Cflags: -I@DOLLAR@{includedir} Cflags: -I@DOLLAR@{includedir}
Requires: json-glib-1.0 libsoup-2.4 glib-2.0 Requires: json-glib-1.0 libsoup-2.4 glib-2.0

6
src/aur/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") 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}\") 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.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps) 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}) add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} ) link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} ) link_directories ( ${DEPS_LIBRARY_DIRS} )
@ -65,7 +65,7 @@ add_library(AUR SHARED ${VALA_C})
set_target_properties( AUR PROPERTIES set_target_properties( AUR PROPERTIES
VERSION VERSION
6.0.0 6.0.1
SOVERSION SOVERSION
6 ) 6 )

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala) 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}\") add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ) include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac ) link_libraries ( ${DEPS_LIBRARIES} -lPamac )

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala) 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}\") add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ) include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lPamac ) link_libraries ( ${DEPS_LIBRARIES} -lPamac )

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala) 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}\") add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala) 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}\") add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur )
link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR )

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac") set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX}) set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.0.0") set (VERSION "6.0.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$") set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala) 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}\") add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.0.0") set (VERSION "6.0.1")
add_definitions (${DEPS_CFLAGS}) add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src ) include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac ) link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac )