[Gsrc-commit] trunk r8460: jami cairo etc

[Carl Hansen]

------------------------------------------------------------
revno: 8460
revision-id: carlhansen1234@gmail.com-20220625065909-bmfsg1xpo01a3110
parent: carlhansen1234@gmail.com-20220624224922-5d6dfa5duno0u29p
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Fri 2022-06-24 23:59:09 -0700
message:
  jami cairo etc
modified:
  pkg/gnome/cairo/Makefile       makefile-20160617013746-7ygosxqw3lxxvo7f-338
  pkg/gnome/cairo/sha256sums     sha256sums-20160617013746-7ygosxqw3lxxvo7f-342
  pkg/gnome/pitivi/Makefile      makefile-20171127063020-qgmj5pygvyyvyqcr-3
  pkg/gnome/pitivi/sha256sums    sha256sums-20171127063020-qgmj5pygvyyvyqcr-4
  pkg/gnu/jami/Makefile          makefile-20161117063932-pdxetajor89caq4s-4
  pkg/gnu/jami/sha256sums        sha256sums-20161117063932-pdxetajor89caq4s-3
  pkg/other/python/Makefile      makefile-20160617200040-lqf8h520dfq0rtk7-67
  pkg/other/python/sha256sums    sha256sums-20160617200040-lqf8h520dfq0rtk7-69

=== modified file 'pkg/gnome/cairo/Makefile'
--- a/pkg/gnome/cairo/Makefile  2022-03-21 02:57:15 +0000
+++ b/pkg/gnome/cairo/Makefile  2022-06-25 06:59:09 +0000
@@ -19,12 +19,12 @@
 #
 # Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
 
-
 NAME =    cairo
 GARNAME = cairo
 GARVERSION = 1.17.6
+#GARVERSION = 1.17.4
 HOME_URL = http://cairographics.org
-DESCRIPTION = cairo , 2d graphics library
+DESCRIPTION = cairo, 2d graphics library
 define BLURB
 Cairo is a 2D graphics library with support for multiple output
 devices. Currently supported output targets include the X Window System
@@ -34,13 +34,20 @@
 endef
 
 ######################################################################
-#
-MASTER_SITES = http://cairographics.org/
+# https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz
+#MASTER_SITES = http://cairographics.org/
 #MASTER_SUBDIR = releases/
-MASTER_SUBDIR = snapshots//
-DISTFILES = $(DISTNAME).tar.xz
-SIGFILES =  
-
+#MASTER_SUBDIR = snapshots/
+
+empty:=
+space:= $(empty) $(empty)
+VERSION_LIST = $(subst .,$(space),$(GARVERSION))
+SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
+
+MASTER_SITES = $(MASTER_GNOME)
+MASTER_SUBDIR = $(GARNAME)/$(SERIES)/
+DISTFILES = $(DISTNAME).tar.xz  $(DISTNAME).sha256sum
+SIGFILES =
 
 BUILDDEPS =  libsigcplusplus 
 LIBDEPS =  

=== modified file 'pkg/gnome/cairo/sha256sums'
--- a/pkg/gnome/cairo/sha256sums        2021-01-02 23:16:32 +0000
+++ b/pkg/gnome/cairo/sha256sums        2022-06-25 06:59:09 +0000
@@ -1,1 +1,2 @@
-74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705  
download/cairo-1.17.4.tar.xz
+4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf  
download/cairo-1.17.6.tar.xz
+a333c3a32859a1e12d4a2960dc05beaff08b81aa46a29f476dee46a7240ee59a  
download/cairo-1.17.6.sha256sum

=== modified file 'pkg/gnome/pitivi/Makefile'
--- a/pkg/gnome/pitivi/Makefile 2021-06-01 05:20:40 +0000
+++ b/pkg/gnome/pitivi/Makefile 2022-06-25 06:59:09 +0000
@@ -1,5 +1,5 @@
 # Copyright © 2013, 2015, 2016 Brandon Invergo <brandon@invergo.net>
-# Copyright © 2017, 2018, 2020, 2021 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2017, 2018, 2020, 2021, 2022 Carl Hansen <carlhansen@gnu.org>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc
@@ -21,7 +21,7 @@
 
 NAME =    pitivi
 GARNAME = pitivi
-GARVERSION = 2021.05
+GARVERSION = 2022.06
 HOME_URL = http://www.gnome.org/projects/pitivi/
 DESCRIPTION = A GTK+-based video editor
 define BLURB
@@ -29,16 +29,16 @@
 
 ######################################################################
 # https://gitlab.gnome.org/GNOME/pitivi/-/archive/1.0/pitivi-1.0.tar.bz2
+# https://download.gnome.org/sources/pitivi/2022/pitivi-2022.06.tar.xz
 
 empty:=
 space:= $(empty) $(empty)
 VERSION_LIST = $(subst .,$(space),$(GARVERSION))
-SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
-SERIES = 2021
+SERIES = $(subst $(space),.,$(wordlist 1,1,$(VERSION_LIST)))
 
 #MASTER_SITES = https://gitlab.gnome.org/
 MASTER_SITES = $(MASTER_GNOME)/
-MASTER_SUBDIR = /$(GARNAME)/$(GARVERSION)/
+MASTER_SUBDIR = /$(GARNAME)/$(SERIES)/
 DISTFILES = $(DISTNAME).tar.xz  $(DISTNAME).sha256sum
 SIGFILES =
 
@@ -47,7 +47,6 @@
 
 ######################################################################
 
-
 include ../../../gar/gar.lib/mesonninja.mk
 include config.mk
 

=== modified file 'pkg/gnome/pitivi/sha256sums'
--- a/pkg/gnome/pitivi/sha256sums       2021-06-01 05:20:40 +0000
+++ b/pkg/gnome/pitivi/sha256sums       2022-06-25 06:59:09 +0000
@@ -1,2 +1,2 @@
-cf5693c46c42ab0da14a2e59bfcf4bc880604b41e9cd3aa8d2ebdc60827b75c7  
download/pitivi-2021.05.tar.xz
-5c9c9081cee0432aec0712514607140edb10589868337b2e346eb1bb2a8246ee  
download/pitivi-2021.05.sha256sum
+533d38e3c6d211c2bd0e95e2b96b0f0833bdf0d5d477ace07df611583506c838  
download/pitivi-2022.06.tar.xz
+b405f089ff741b9f3734c487533fcee64ba5d819e9c15831ec8991f9e1293461  
download/pitivi-2022.06.sha256sum

=== modified file 'pkg/gnu/jami/Makefile'
--- a/pkg/gnu/jami/Makefile     2022-04-09 04:18:36 +0000
+++ b/pkg/gnu/jami/Makefile     2022-06-25 06:59:09 +0000
@@ -20,7 +20,7 @@
 
 NAME =  Jami a.k.a. Ring
 GARNAME = jami
-GARVERSION = 20220331.1409.87fc96d
+GARVERSION = 20220503.1550.0f35faa
 HOME_URL = https://jami.net
 DESCRIPTION = A privacy-respecting comm program for video, voice, text, data
 define BLURB 

=== modified file 'pkg/gnu/jami/sha256sums'
--- a/pkg/gnu/jami/sha256sums   2022-04-08 20:30:41 +0000
+++ b/pkg/gnu/jami/sha256sums   2022-06-25 06:59:09 +0000
@@ -1,1 +1,1 @@
-06c26f477549d8f61e90761ae244f9f8141f2f01cb6e0379ed77a0f3d6599da8  
download/jami_20220331.1409.87fc96d.tar.gz
+515eaedbaaf510cde206bbda5837c5dd6d9759799f602320c4e7d0e5c56e1209  
download/jami_20220503.1550.0f35faa.tar.gz

=== modified file 'pkg/other/python/Makefile'
--- a/pkg/other/python/Makefile 2022-04-02 19:26:20 +0000
+++ b/pkg/other/python/Makefile 2022-06-25 06:59:09 +0000
@@ -23,7 +23,7 @@
 NAME = Python
 GARNAME = python
 UPSTREAMNAME = Python
-GARVERSION = 3.10.4
+GARVERSION = 3.10.5
 BASEVERSION = 3.10
 HOME_URL = http://python.org
 DESCRIPTION = A general-purpose, high-level programming language

=== modified file 'pkg/other/python/sha256sums'
--- a/pkg/other/python/sha256sums       2022-04-02 19:26:20 +0000
+++ b/pkg/other/python/sha256sums       2022-06-25 06:59:09 +0000
@@ -1,2 +1,2 @@
-80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19  
download/Python-3.10.4.tar.xz
-a4d5ff92a2743029a7bec2cb8cf07b799c52199d27493d453d38a37036c7d896  
download/Python-3.10.4.tar.xz.asc
+8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486  
download/Python-3.10.5.tar.xz
+80fad2180a1154abcea496ea994bc2504b54ccf6f464b4d82660767d2d4abfe6  
download/Python-3.10.5.tar.xz.asc