Re: git: 674d093cd093 - main - x11/mate-panel: Revert "x11/mate-panel: Revert to 1.24.2 and bump PORTEPOCH"

In reply to: Eric Turgeon : "git: 674d093cd093 - main - x11/mate-panel: Revert "x11/mate-panel: Revert to 1.24.2 and bump PORTEPOCH""
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Piotr Kubaj <pkubaj_at_anongoth.pl>
Date: Tue, 19 Oct 2021 23:43:22 UTC

Since you previously bumped PORTEPOCH, upgrading won't work now.

You need to leave PORTEPOCH.

On 21-10-19 23:37:32, Eric Turgeon wrote:
> The branch main has been updated by ericbsd:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=674d093cd09349d36e8dec9c0dcdf05daf0fc988
> 
> commit 674d093cd09349d36e8dec9c0dcdf05daf0fc988
> Author:     Eric Turgeon <ericbsd@FreeBSD.org>
> AuthorDate: 2021-10-19 23:34:33 +0000
> Commit:     Eric Turgeon <ericbsd@FreeBSD.org>
> CommitDate: 2021-10-19 23:37:24 +0000
> 
>     x11/mate-panel: Revert "x11/mate-panel: Revert to 1.24.2 and bump PORTEPOCH"
>     
>     This reverts commit 0d45d70a5fdf13af63c2363ae7c57a1def43415f.
>     
>     It should have never been reverted at the first place.
>     
>     PR:             259058
>     Reported by:    John Hein
> ---
>  x11/mate-panel/Makefile  | 6 +-----
>  x11/mate-panel/distinfo  | 8 +++-----
>  x11/mate-panel/pkg-plist | 4 ++++
>  3 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
> index 77916eda144b..7b25c860e717 100644
> --- a/x11/mate-panel/Makefile
> +++ b/x11/mate-panel/Makefile
> @@ -1,15 +1,11 @@
>  # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
>  
>  PORTNAME=	mate-panel
> -PORTVERSION=	1.24.2
> -PORTEPOCH=	1
> +PORTVERSION=	1.26.1
>  CATEGORIES=	x11 mate
>  MASTER_SITES=	MATE
>  DIST_SUBDIR=	mate
>  
> -PATCH_SITES=	https://github.com/mate-desktop/${PORTNAME}/commit/
> -PATCHFILES+=	9f15be59faa7.patch:-p1 # https://github.com/mate-desktop/mate-panel/pull/1104
> -
>  MAINTAINER=	gnome@FreeBSD.org
>  COMMENT=	Panel component for the MATE Desktop
>  
> diff --git a/x11/mate-panel/distinfo b/x11/mate-panel/distinfo
> index a142fac86d82..2fab1231762e 100644
> --- a/x11/mate-panel/distinfo
> +++ b/x11/mate-panel/distinfo
> @@ -1,5 +1,3 @@
> -TIMESTAMP = 1623609107
> -SHA256 (mate/mate-panel-1.24.2.tar.xz) = 30c5ba0392ec76b110220ee6d10bbdba76af36586592a6b3d604db70602848ea
> -SIZE (mate/mate-panel-1.24.2.tar.xz) = 3271432
> -SHA256 (mate/9f15be59faa7.patch) = f3e7c063a122ae41809276b61a2ec306a27562ef65832eb3ffe92063868ad819
> -SIZE (mate/9f15be59faa7.patch) = 804
> +TIMESTAMP = 1633811941
> +SHA256 (mate/mate-panel-1.26.1.tar.xz) = 683038c483456e5068f5bb20c3d565936700c9898005c7149ee7aa44e5cc110d
> +SIZE (mate/mate-panel-1.26.1.tar.xz) = 3309564
> diff --git a/x11/mate-panel/pkg-plist b/x11/mate-panel/pkg-plist
> index 52184bf6ff0c..b4c58e6ba6ba 100644
> --- a/x11/mate-panel/pkg-plist
> +++ b/x11/mate-panel/pkg-plist
> @@ -813,6 +813,9 @@ share/help/zh_CN/mate-clock/legal.xml
>  share/help/zh_CN/mate-fish/figures/fish_applet.png
>  share/help/zh_CN/mate-fish/index.docbook
>  share/help/zh_CN/mate-fish/legal.xml
> +share/help/zh-Hans/mate-clock/figures/clock_applet.png
> +share/help/zh-Hans/mate-clock/index.docbook
> +share/help/zh-Hans/mate-clock/legal.xml
>  share/help/zh_HK/mate-clock/figures/clock_applet.png
>  share/help/zh_HK/mate-clock/index.docbook
>  share/help/zh_HK/mate-clock/legal.xml
> @@ -955,6 +958,7 @@ share/locale/el/LC_MESSAGES/mate-panel.mo
>  share/locale/en_AU/LC_MESSAGES/mate-panel.mo
>  share/locale/en_CA/LC_MESSAGES/mate-panel.mo
>  share/locale/en_GB/LC_MESSAGES/mate-panel.mo
> +share/locale/en_US/LC_MESSAGES/mate-panel.mo
>  share/locale/eo/LC_MESSAGES/mate-panel.mo
>  share/locale/es/LC_MESSAGES/mate-panel.mo
>  share/locale/es_AR/LC_MESSAGES/mate-panel.mo