? patches-
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 26 Nov 2016 02:06:16 -0000 1.5
+++ Makefile 26 May 2017 22:51:00 -0000
@@ -2,12 +2,11 @@
COMMENT= freedesktop-compliant panel
-V= 0.12.2
-REVISION= 2
+V= 0.14.5
CATEGORIES= x11
DISTNAME= tint2-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST= ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST= ${WRKDIR}/tint2-v$V-d10a505aa951c8c3589f5c5f3a2fb0c2f0dd93b4
INSTDIR= ${PREFIX}/tint2
HOMEPAGE= https://gitlab.com/o9000/tint2/
@@ -25,14 +24,17 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
WANTLIB += z
BUILD_DEPENDS= devel/gettext-tools
+
LIB_DEPENDS= graphics/imlib2 \
devel/gettext \
devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS= x11/py-gtk2 \
- devel/desktop-file-utils
+
+RUN_DEPENDS= devel/desktop-file-utils \
+ misc/shared-mime-info \
+ x11/py-gtk2
MODULES= devel/cmake \
lang/python \
@@ -45,10 +47,8 @@ NO_TEST= Yes
CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
post-install:
- cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
- sed -i -e '/\/usr\/local\/share\/applications/d' -e \
- 's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
- ${PREFIX}/share/examples/tint2/*tint2rc
- rm ${PREFIX}/share/tint2/*.tint2rc
+ cp -R ${PREFIX}/share/tint2/ ${PREFIX}/share/examples/tint2/
+ rm ${PREFIX}/share/tint2/*.tint2rc
+ rm ${PREFIX}/share/examples/tint2/*.png
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 11 Sep 2015 14:14:07 -0000 1.1.1.1
+++ distinfo 26 May 2017 22:51:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.5.tar.gz) = OGhFdgAAfD9OK/yhTQ+iFp4BMwlF5o+S5yeg7U1rZjk=
+SIZE (tint2-0.14.5.tar.gz) = 465986
Index: patches/patch-src_tint2conf_main_c
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_main_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c 26 Nov 2016 02:06:16 -0000 1.1
+++ patches/patch-src_tint2conf_main_c 26 May 2017 22:51:00 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.1 2016/11/26 02:06:16 jca Exp $
---- src/tint2conf/main.c.orig Tue Nov 22 21:42:54 2016
-+++ src/tint2conf/main.c Tue Nov 22 21:43:58 2016
-@@ -503,7 +503,7 @@ static void set_current_theme()
+$OpenBSD$
+
+Index: src/tint2conf/main.c
+--- src/tint2conf/main.c.orig
++++ src/tint2conf/main.c
+@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)
- gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
- {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", main_file, (long long)time(NULL));
- copy_file(main_file, backup_path);
- g_free(backup_path);
- }
+ void make_backup(const char *filepath)
+ {
+- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
++ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
+ copy_file(filepath, backup_path);
+ g_free(backup_path);
+ }
Index: patches/patch-src_tint2conf_properties_c
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_properties_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tint2conf_properties_c
--- patches/patch-src_tint2conf_properties_c 26 Nov 2016 02:06:16 -0000 1.1
+++ patches/patch-src_tint2conf_properties_c 26 May 2017 22:51:00 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_tint2conf_properties_c,v 1.1 2016/11/26 02:06:16 jca Exp $
---- src/tint2conf/properties.c.orig Tue Nov 22 21:44:18 2016
-+++ src/tint2conf/properties.c Tue Nov 22 21:44:32 2016
-@@ -171,7 +171,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
- gchar *file = get_current_theme_file_name();
- if (file) {
- if (config_is_manual(file)) {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", file, time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", file, (long long)time(NULL));
- copy_file(file, backup_path);
- g_free(backup_path);
- }
+$OpenBSD$
+
+Index: src/tint2conf/properties.c
+--- src/tint2conf/properties.c.orig
++++ src/tint2conf/properties.c
+@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
+ gchar *filepath = get_current_theme_path();
+ if (filepath) {
+ if (config_is_manual(filepath)) {
+- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
++ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
+ copy_file(filepath, backup_path);
+ g_free(backup_path);
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 11 Sep 2015 14:14:07 -0000 1.1.1.1
+++ pkg/PLIST 26 May 2017 22:51:00 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
+@comment $OpenBSD$
@pkgpath x11/tint
@bin bin/tint2
@bin bin/tint2conf
@@ -9,8 +9,16 @@ share/doc/tint2/
share/doc/tint2/AUTHORS
share/doc/tint2/ChangeLog
share/doc/tint2/README.md
+share/doc/tint2/html/
+share/doc/tint2/html/images/
+share/doc/tint2/html/images/panel_padding.jpg
+share/doc/tint2/html/images/panel_size_margin.jpg
+share/doc/tint2/html/images/task_padding.jpg
+share/doc/tint2/html/images/taskbar_padding.jpg
+share/doc/tint2/html/manual.html
+share/doc/tint2/html/readme.html
+share/doc/tint2/tint2.md
share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg/
share/examples/tint2/horizontal-dark-opaque.tint2rc
share/examples/tint2/horizontal-dark-transparent.tint2rc
share/examples/tint2/horizontal-light-opaque.tint2rc
@@ -31,22 +39,24 @@ share/examples/tint2/text_only_3.tint2rc
share/examples/tint2/text_only_4.tint2rc
share/examples/tint2/text_only_5.tint2rc
share/examples/tint2/text_only_6.tint2rc
-share/examples/tint2/tint2rc
-@sample ${SYSCONFDIR}/xdg/tint2/
-@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
share/examples/tint2/vertical-dark-opaque.tint2rc
share/examples/tint2/vertical-dark-transparent.tint2rc
share/examples/tint2/vertical-light-opaque.tint2rc
share/examples/tint2/vertical-light-transparent.tint2rc
+share/examples/tint2/vertical-neutral-icons.tint2rc
share/icons/hicolor/scalable/apps/tint2.svg
share/icons/hicolor/scalable/apps/tint2conf.svg
share/locale/bs/LC_MESSAGES/tint2conf.mo
share/locale/fr/LC_MESSAGES/tint2conf.mo
share/locale/hr/LC_MESSAGES/tint2conf.mo
share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/ru/LC_MESSAGES/tint2conf.mo
share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
share/tint2/
share/tint2/default_icon.png
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
On May 26, 2017: 22:34, Stuart Henderson wrote:
>On 2017/05/26 12:49, Heppler, J. Scott wrote:
>> On May 21, 2017: 18:00, Daniel Jakots wrote:
>> > On Sun, 21 May 2017 14:27:09 -0700, "Heppler, J. Scott"
>> > <shep971@centurylink.net> wrote:
>> >
>> > > ? ports/x11/tint2/patches
>> >
>> > It looks like something is missing :)
>
>yes. "make patch" fails with the diff as sent.
>
>assuming patches/ has the correct patches in, i would:
>
>mv patches patches-
>cvs up -PdA patches
>rsync -avC --delete patches-/ patches/
>cd patches
>cvs add / cvs rm as necessary
>cd ..
>cvs di -uNp
>
>> > > ===================================================================
>> > > RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
>> > > retrieving revision 1.1.1.1
>> > > diff -u -p -u -r1.1.1.1 PLIST
>> > > --- ports/x11/tint2/pkg/PLIST 11 Sep 2015 14:14:07
>> > > -0000 1.1.1.1 +++ ports/x11/tint2/pkg/PLIST 21 May 2017
>> > > 21:12:38 -0000 @@ -1,5 +1,4 @@
>> > > -@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
>> > > -@pkgpath x11/tint
>> > > +@comment $OpenBSD$
>> >
>> > I think the @pkgpath must stay.
>>
>> I'm glad to update this but I want to confirm the change. I submitted
>> the last x11/tint2 update and my memory is that the @pkgpath entry was
>> to provide seamless upgrades due to the name change tint -> tint2. My
>> understanding previously was that the @pkgpath entry would only be
>> necessary for 2 release cycles - the last upgrade was 20 months ago.
>>
>> --
>> J. Scott Heppler
>>
>
>I don't see a reason to remove the @pkgpath marker in this case.
>We don't *support* upgrades that skip over versions but there's no
>reason to actively break them unless it's hurting something..
>
The unpatched source generated warning regarding variable type
declaration that the previous maintainer had patched to long long.
Updated diff attached
--
J. Scott Heppler
No comments:
Post a Comment