Mercurial > pidgin3 / changeset

changeset

Make all of the subprojects use tarballs

Wed, 22 Jan 2025 22:41:16 -0600

author
Gary Kramlich <grim@reaperworld.com>
date
Wed, 22 Jan 2025 22:41:16 -0600
changeset 43159
2bde48da761d
parent 43150
fb0660fc1877
child 43160
a9cc7d8325ba

Make all of the subprojects use tarballs

Now that we've had a release we need to use tarballs for our subprojects to
ease the pressure on hgkeeper.

I also updated everything to the most recent releases as well.

Testing Done:
Removed the subproject directories and called in the turtles. Also built the flatpak.

Reviewed at https://reviews.imfreedom.org/r/3771/

im.pidgin.Pidgin3.yml file | annotate | diff | comparison | revisions
libpurple/reference/meson.build file | annotate | diff | comparison | revisions
meson.build file | annotate | diff | comparison | revisions
pidgin/reference/meson.build file | annotate | diff | comparison | revisions
protocols/ircv3/meson.build file | annotate | diff | comparison | revisions
subprojects/birb.wrap file | annotate | diff | comparison | revisions
subprojects/gplugin.wrap file | annotate | diff | comparison | revisions
subprojects/hasl.wrap file | annotate | diff | comparison | revisions
subprojects/ibis.wrap file | annotate | diff | comparison | revisions 
--- a/im.pidgin.Pidgin3.yml	Sat Jan 18 23:56:17 2025 -0600
+++ b/im.pidgin.Pidgin3.yml	Wed Jan 22 22:41:16 2025 -0600
@@ -51,8 +51,8 @@
     sources:
       - type: archive
         archive-type: tar-xz
-        url: https://sourceforge.net/projects/pidgin/files/birb/0.2.0/birb-0.2.0-dev.tar.xz/download
-        sha256: b4c24426a6c9aeb959a7a8d60d31def8e90cfb17680c90a0cc54d582789ecc38
+        url: https://sourceforge.net/projects/pidgin/files/birb/0.3.1/birb-0.3.1.tar.xz/download
+        sha256: 70fa6462042f7d7c86a495eb93355fa14af057136b691e23838290bbcf57465c
   - name: hasl
     buildsystem: meson
     config-opts:
@@ -61,8 +61,8 @@
     sources:
       - type: archive
         archive-type: tar-xz
-        url: https://sourceforge.net/projects/pidgin/files/hasl/0.3.2/hasl-0.3.2.tar.xz/download
-        sha256: d67ba1ce29c6f1fcdc69dadae0bafe12cf60b9e8be80bb67b5f4f9e0db44c427
+        url: https://sourceforge.net/projects/pidgin/files/hasl/0.4.0/hasl-0.4.0.tar.xz/download
+        sha256: e78c244a259f13d43d230e9a8909bf0437a9466bef6757770a54a60c7c720036
   - name: ibis
     buildsystem: meson
     config-opts:
@@ -71,8 +71,8 @@
     sources:
       - type: archive
         archive-type: tar-xz
-        url: https://sourceforge.net/projects/pidgin/files/ibis/0.10.2/ibis-0.10.2.tar.xz/download
-        sha256: 5a67b3089deac9632c908a71a2950aec12195a111c2ca1fe517c6f156bddd6a4
+        url: https://sourceforge.net/projects/pidgin/files/ibis/0.11.0/ibis-0.11.0.tar.xz/download
+        sha256: 9f2d4a13229ca5848d1cf3a0f56ffdde4f8decea4b6b0101d5c10421a9ba35dc
   - name: xeme
     buildsystem: meson
     config-opts:
--- a/libpurple/reference/meson.build	Sat Jan 18 23:56:17 2025 -0600
+++ b/libpurple/reference/meson.build	Wed Jan 22 22:41:16 2025 -0600
@@ -5,6 +5,11 @@
 ]
 
 if get_option('doc')
+	libpurple_doc_girs = [
+		'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb-@0@/birb'.format(birb_dep.version())),
+		'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin-@0@/gplugin'.format(gplugin_dep.version())),
+	]
+
 	libpurple_toml = configure_file(
 		input : 'libpurple.toml.in',
 		output : 'libpurple.toml',
@@ -25,8 +30,7 @@
 			'--output-dir=@OUTPUT@',
 			'--no-namespace-dir',
 			'--content-dir=@0@'.format(meson.current_source_dir()),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb/birb'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
+			libpurple_doc_girs,
 			'@INPUT1@'
 		],
 		depend_files : [ libpurple_doc_content_files ],
@@ -40,8 +44,7 @@
 		args: [
 			'check',
 			'--config', libpurple_toml,
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb/birb'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
+			libpurple_doc_girs,
 			libpurple_gir[0],
 		],
 		depends: libpurple_gir[0],
--- a/meson.build	Sat Jan 18 23:56:17 2025 -0600
+++ b/meson.build	Wed Jan 22 22:41:16 2025 -0600
@@ -251,7 +251,7 @@
 #######################################################################
 # Check for birb glib utility library
 #######################################################################
-birb_dep = dependency('birb', version : '>=0.2.0')
+birb_dep = dependency('birb', version : '>=0.3.1')
 
 #######################################################################
 # Check for Xeme XMPP Library
@@ -390,7 +390,7 @@
 #######################################################################
 # Check for Hasl
 #######################################################################
-hasl = dependency('hasl', version : '>= 0.3.2')
+hasl = dependency('hasl', version : '>= 0.4.0')
 
 #######################################################################
 # Documentation
--- a/pidgin/reference/meson.build	Sat Jan 18 23:56:17 2025 -0600
+++ b/pidgin/reference/meson.build	Wed Jan 22 22:41:16 2025 -0600
@@ -2,6 +2,13 @@
 ]
 
 if get_option('doc')
+	pidgin_doc_girs = [
+		'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb-@0@/birb'.format(birb_dep.version())),
+		'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin-@0@/gplugin'.format(gplugin_dep.version())),
+		'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin-@0@/gplugin-gtk4'.format(gplugin_gtk_dep.version())),
+		'--add-include-path=@0@'.format(meson.project_build_root() / 'libpurple'),
+	]
+
 	pidgin_toml = configure_file(
 		input : 'pidgin.toml.in',
 		output : 'pidgin.toml',
@@ -22,10 +29,7 @@
 			'--output-dir=@OUTPUT@',
 			'--no-namespace-dir',
 			'--content-dir=@0@'.format(meson.current_source_dir()),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb/birb'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin-gtk4'),
-			'--add-include-path=@0@'.format(meson.project_build_root() / 'libpurple'),
+			pidgin_doc_girs,
 			'@INPUT1@'
 		],
 		depends: [ libpurple_gir[0] ],
@@ -40,10 +44,7 @@
 		args: [
 			'check',
 			'--config', pidgin_toml,
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/birb/birb'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
-			'--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin-gtk4'),
-			'--add-include-path=@0@'.format(meson.project_build_root() / 'libpurple'),
+			pidgin_doc_girs,
 			pidgin_gir[0],
 		],
 		depends: [libpurple_gir[0], pidgin_gir[0]],
--- a/protocols/ircv3/meson.build	Sat Jan 18 23:56:17 2025 -0600
+++ b/protocols/ircv3/meson.build	Wed Jan 22 22:41:16 2025 -0600
@@ -22,7 +22,7 @@
 	subdir_done()
 endif
 
-ibis_dep = dependency('ibis', version : '>= 0.10.1')
+ibis_dep = dependency('ibis', version : '>= 0.11.0')
 
 ircv3_filebase = f'purple-@purple_api_major_version@-ircv3'
 ircv3_filebase = f'purple-@purple_api_major_version@-ircv3'
--- a/subprojects/birb.wrap	Sat Jan 18 23:56:17 2025 -0600
+++ b/subprojects/birb.wrap	Wed Jan 22 22:41:16 2025 -0600
@@ -1,4 +1,5 @@
-[wrap-hg]
-directory = birb
-url = https://keep.imfreedom.org/birb/birb/
-revision = v0.2.0
+[wrap-file]
+directory = birb-0.3.1
+source_url = https://sourceforge.net/projects/pidgin/files/birb/0.3.1/birb-0.3.1.tar.xz
+source_filename = birb-0.3.1.tar.xz
+source_hash = 70fa6462042f7d7c86a495eb93355fa14af057136b691e23838290bbcf57465c
--- a/subprojects/gplugin.wrap	Sat Jan 18 23:56:17 2025 -0600
+++ b/subprojects/gplugin.wrap	Wed Jan 22 22:41:16 2025 -0600
@@ -1,4 +1,5 @@
-[wrap-hg]
-directory = gplugin
-url = https://keep.imfreedom.org/gplugin/gplugin
-revision = v0.44.2
+[wrap-file]
+directory = gplugin-0.44.2
+source_url = https://sourceforge.net/projects/pidgin/files/gplugin/0.44.2/gplugin-0.44.2.tar.xz
+source_filename = gplugin-0.44.2.tar.xz
+source_hash = aea244e1add9628b50ec042c54cf93803f4577f8f142678f09b91fd4c0b20f72
--- a/subprojects/hasl.wrap	Sat Jan 18 23:56:17 2025 -0600
+++ b/subprojects/hasl.wrap	Wed Jan 22 22:41:16 2025 -0600
@@ -1,4 +1,5 @@
-[wrap-hg]
-directory = hasl
-url = https://keep.imfreedom.org/hasl/hasl/
-revision = v0.3.2
+[wrap-file]
+directory = hasl-0.4.0
+source_url = https://sourceforge.net/projects/pidgin/files/hasl/0.4.0/hasl-0.4.0.tar.xz
+source_filename = hasl-0.4.0.tar.xz
+source_hash = e78c244a259f13d43d230e9a8909bf0437a9466bef6757770a54a60c7c720036
--- a/subprojects/ibis.wrap	Sat Jan 18 23:56:17 2025 -0600
+++ b/subprojects/ibis.wrap	Wed Jan 22 22:41:16 2025 -0600
@@ -1,4 +1,5 @@
-[wrap-hg]
-directory = ibis
-url = https://keep.imfreedom.org/ibis/ibis
-revision = v0.10.2
+[wrap-file]
+directory = ibis-0.11.0
+source_url = https://sourceforge.net/projects/pidgin/files/ibis/0.11.0/ibis-0.11.0.tar.xz
+source_filename = ibis-0.11.0.tar.xz
+source_hash = 9f2d4a13229ca5848d1cf3a0f56ffdde4f8decea4b6b0101d5c10421a9ba35dc

Mercurial Repository: pidgin3

mercurial