Browse Source

update to new autovala 1.2.0 cmake and meson files

Chris Cromer 1 year ago
parent
commit
f545ec85d7

+ 0
- 4
.gitignore View File

@@ -6,7 +6,3 @@ data/interface/#*#
6 6
 PKGBUILD
7 7
 *.pkg.tar.xz
8 8
 *.pkg.tar.xz.sig
9
-/build
10
-.bzrignore
11
-.hgignore
12
-data/local/

+ 7
- 2
autogen.sh View File

@@ -8,5 +8,10 @@ make
8 8
 make clean
9 9
 popd
10 10
 
11
-# Update the autovala environment
12
-autovala update
11
+# Update the autovala project file
12
+autovala refresh
13
+# Remove unused folders and files made by autovala
14
+rm -rf ./{install,packages,doc} ./data/{local,bash_completion} ./.hgignore ./.bzrignore
15
+# Generate the cmake and meson build files
16
+autovala cmake
17
+autovala meson

+ 1
- 14
data/mime/CMakeLists.txt View File

@@ -1,17 +1,4 @@
1 1
 ### CMakeLists automatically created with AutoVala
2 2
 ### Do not edit
3 3
 
4
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml)
5
-	install(DIRECTORY
6
-		${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml
7
-	DESTINATION
8
-		/usr/share/mime/packages
9
-	)
10
-ELSE()
11
-	install(FILES
12
-		${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml
13
-	DESTINATION
14
-		/usr/share/mime/packages
15
-	)
16
-ENDIF()
17
-
4
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/)

+ 1
- 14
data/polkit/CMakeLists.txt View File

@@ -1,17 +1,4 @@
1 1
 ### CMakeLists automatically created with AutoVala
2 2
 ### Do not edit
3 3
 
4
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy)
5
-	install(DIRECTORY
6
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy
7
-	DESTINATION
8
-		/usr/share/polkit-1/actions
9
-	)
10
-ELSE()
11
-	install(FILES
12
-		${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy
13
-	DESTINATION
14
-		/usr/share/polkit-1/actions
15
-	)
16
-ENDIF()
17
-
4
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)

+ 0
- 20
doc/CMakeLists.txt View File

@@ -1,20 +0,0 @@
1
-### CMakeLists automatically created with AutoVala
2
-### Do not edit
3
-
4
-file(GLOB list_data RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
5
-foreach(file_data ${list_data})
6
-	IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${file_data})
7
-		install(DIRECTORY
8
-			${file_data}
9
-		DESTINATION
10
-			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
11
-		)
12
-	ELSE()
13
-		install(FILES
14
-			${file_data}
15
-		DESTINATION
16
-			${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
17
-		)
18
-	ENDIF()
19
-endforeach()
20
-

+ 2
- 8
meson.build View File

@@ -35,10 +35,6 @@ meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','
35 35
 
36 36
 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-mirrorlist.timer'))
37 37
 
38
-meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/polkit-1/actions',join_paths(meson.current_source_dir(),'data/polkit','org.pamac.policy'))
39
-
40
-meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/mime/packages',join_paths(meson.current_source_dir(),'data/mime','x-alpm-package.xml'))
41
-
42 38
 if DISABLE_AUR
43 39
 	meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc',join_paths(meson.current_source_dir(),'data/config/noaur','pamac.conf'))
44 40
 
@@ -58,10 +54,6 @@ pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile
58 54
 
59 55
 pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml'])
60 56
 
61
-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','','*'))
62
-
63
-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','','*'))
64
-
65 57
 install_data('data/pamac-install.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
66 58
 install_data('data/pamac-manager.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
67 59
 if ENABLE_UPDATE_ICON
@@ -90,6 +82,8 @@ install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: joi
90 82
 install_data('data/icons/24x24/status/pamac-tray-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
91 83
 install_data('data/icons/32x32/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/32x32/apps'))
92 84
 install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
85
+install_data( 'data/polkit/org.pamac.policy',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'polkit-1','actions'))
86
+install_data( 'data/mime/x-alpm-package.xml',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'mime','packages'))
93 87
 subdir('src')
94 88
 subdir('src/pamac-user-daemon')
95 89
 subdir('src/pamac-tray')

+ 13
- 10
pamac.avprj View File

@@ -1,6 +1,7 @@
1 1
 ### AutoVala Project ###
2
-autovala_version: 26
2
+autovala_version: 27
3 3
 project_name: pamac-classic
4
+project_version: 6.4.1
4 5
 vala_version: 0.38
5 6
 
6 7
 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
@@ -8,8 +9,6 @@ custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system
8 9
 custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system
9 10
 custom: data/systemd/pamac-mirrorlist.service /usr/lib/systemd/system
10 11
 custom: data/systemd/pamac-mirrorlist.timer /usr/lib/systemd/system
11
-custom: data/polkit/org.pamac.policy /usr/share/polkit-1/actions
12
-custom: data/mime/x-alpm-package.xml /usr/share/mime/packages
13 12
 if DISABLE_AUR
14 13
 custom: data/config/noaur/pamac.conf /etc
15 14
 else
@@ -27,7 +26,7 @@ define: KDE_TRAY
27 26
 vapidir: src/vapis
28 27
 
29 28
 vala_binary: src/pamac-clean-cache/pamac-clean-cache
30
-version: 6.4.0
29
+*version: 6.4.1
31 30
 vala_local_package: pamacclassic
32 31
 vala_package: posix
33 32
 vala_check_package: gtk+-3.0
@@ -39,7 +38,7 @@ vala_check_package: json-glib-1.0
39 38
 *vala_source: pamac_config.vala
40 39
 
41 40
 vala_binary: src/pamac-install/pamac-install
42
-version: 6.4.0
41
+*version: 6.4.1
43 42
 use_gresource: pamac_installer_gresource_xml
44 43
 vala_local_package: pamacclassic
45 44
 vala_check_package: gtk+-3.0
@@ -51,7 +50,7 @@ vala_check_package: json-glib-1.0
51 50
 *vala_source: progress_dialog.vala
52 51
 
53 52
 vala_binary: src/pamac-manager/pamac-manager
54
-version: 6.4.0
53
+*version: 6.4.1
55 54
 alias: pamac-updater
56 55
 use_gresource: pamac_manager_gresource_xml
57 56
 vala_local_package: pamacclassic
@@ -65,7 +64,7 @@ vala_check_package: json-glib-1.0
65 64
 *vala_source: manager_window.vala
66 65
 
67 66
 vala_binary: src/pamac-system-daemon/pamac-system-daemon
68
-version: 6.4.0
67
+*version: 6.4.1
69 68
 vala_local_package: pamacclassic
70 69
 vala_package: posix
71 70
 vala_check_package: gtk+-3.0
@@ -83,7 +82,7 @@ vala_check_package: polkit-gobject-1
83 82
 *vala_source: system_daemon.vala
84 83
 
85 84
 vala_binary: src/pamac-tray/pamac-tray
86
-version: 6.4.0
85
+*version: 6.4.1
87 86
 vala_local_package: pamacclassic
88 87
 vala_package: posix
89 88
 vala_check_package: json-glib-1.0
@@ -107,7 +106,7 @@ end
107 106
 *vala_source: tray.vala
108 107
 
109 108
 vala_binary: src/pamac-user-daemon/pamac-user-daemon
110
-version: 6.4.0
109
+*version: 6.4.1
111 110
 vala_local_package: pamacclassic
112 111
 vala_package: posix
113 112
 vala_check_package: gtk+-3.0
@@ -122,7 +121,7 @@ vala_check_package: libsoup-2.4
122 121
 
123 122
 
124 123
 vala_library: src/pamac-classic
125
-version: 6.4.0
124
+*version: 6.4.1
126 125
 namespace: pamacclassic
127 126
 use_gresource: pamac_transaction_gresource_xml
128 127
 vala_package: posix
@@ -222,3 +221,7 @@ end
222 221
 
223 222
 *pixmap: data/pixmaps/package-generic.png
224 223
 
224
+*polkit: data/polkit/org.pamac.policy
225
+
226
+*mimetype: data/mime/x-alpm-package.xml
227
+

+ 1
- 1
po/pamac.pot View File

@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: Pamac\n"
10 10
 "Report-Msgid-Bugs-To: cromer@cromnix.org\n"
11
-"POT-Creation-Date: 2017-10-29 17:33-0300\n"
11
+"POT-Creation-Date: 2017-10-30 20:11-0300\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"

+ 3
- 3
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16 16
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
17 17
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
18
-set (VERSION "6.4.0")
18
+set (VERSION "6.4.1")
19 19
 add_definitions (${DEPS_CFLAGS})
20 20
 link_libraries ( ${DEPS_LIBRARIES} )
21 21
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -96,7 +96,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
96 96
 target_link_libraries( pamacclassic m )
97 97
 set_target_properties( pamacclassic PROPERTIES
98 98
 VERSION
99
-	6.4.0
99
+	6.4.1
100 100
 SOVERSION
101 101
 	6 )
102 102
 

+ 3
- 3
src/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
4 4
 cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_classic.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_classic.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_classic.set('VERSION', '6.4.0')
7
+cfg_pamac_classic.set('VERSION', '6.4.1')
8 8
 cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
@@ -55,7 +55,7 @@ pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : fals
55 55
 pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']
56 56
 
57 57
 
58
-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.0',soversion: '6',install: true)
58
+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)
59 59
 
60 60
 pamac_classic_requires = []
61 61
 pamac_classic_requires += ['gdk-3.0']
@@ -70,7 +70,7 @@ pamac_classic_requires += ['glib-2.0']
70 70
 pamac_classic_requires += ['gobject-2.0']
71 71
 pkg_mod = import('pkgconfig')
72 72
 pkg_mod.generate(libraries : pamacclassic_library,
73
-	version : '6.4.0',
73
+	version : '6.4.1',
74 74
 	name : 'pamacclassic',
75 75
 	filebase : 'pamacclassic',
76 76
 	description : 'pamacclassic',

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
4 4
 cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_clean_cache.set('VERSION', '6.4.0')
7
+cfg_pamac_clean_cache.set('VERSION', '6.4.1')
8 8
 cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
4 4
 cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_install.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_install.set('VERSION', '6.4.0')
7
+cfg_pamac_install.set('VERSION', '6.4.1')
8 8
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
4 4
 cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_manager.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_manager.set('VERSION', '6.4.0')
7
+cfg_pamac_manager.set('VERSION', '6.4.1')
8 8
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op
4 4
 cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_system_daemon.set('VERSION', '6.4.0')
7
+cfg_pamac_system_daemon.set('VERSION', '6.4.1')
8 8
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat
4 4
 cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_tray.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_tray.set('VERSION', '6.4.0')
7
+cfg_pamac_tray.set('VERSION', '6.4.1')
8 8
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
7 7
 set (RELEASE_NAME "pamac-classic")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.4.0")
10
+set (VERSION "6.4.1")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.4.0")
16
+set (VERSION "6.4.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,7 +4,7 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
4 4
 cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac-classic')
5 5
 cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic')
6 6
 cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_user_daemon.set('VERSION', '6.4.0')
7
+cfg_pamac_user_daemon.set('VERSION', '6.4.1')
8 8
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)

+ 3
- 5
src/pamacclassic.pc View File

@@ -1,12 +1,10 @@
1 1
 prefix=@CMAKE_INSTALL_PREFIX@
2
-real_prefix=@CMAKE_INSTALL_PREFIX@
3
-exec_prefix=@DOLLAR@{prefix}
4
-libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR}
5
-includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}
2
+libdir=@DOLLAR@{prefix}/${CMAKE_INSTALL_LIBDIR}
3
+includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
6 4
 
7 5
 Name: pamacclassic
8 6
 Description: pamacclassic
9
-Version: 6.4.0
7
+Version: 6.4.1
10 8
 Libs: -L@DOLLAR@{libdir} -lpamacclassic
11 9
 Cflags: -I@DOLLAR@{includedir}
12 10
 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

Loading…
Cancel
Save