Re: meta/xfce: remove calendar (orage) from DESCR-main
Le Thu, Dec 22, 2022 at 05:12:39PM +, Klemens Nanni a écrit : > The dependency was removed in the 4.14 update and nothing depends on > x11/xfce4/orage these days. > > I wouldn't miss it in neither the main meta/xfce nor the -extras meta > package: the tray plugin provides a drop-down calendar version on click > which looks just like the standalone GUI provided by orage. > > Then again, if it isn't installed by any of the meta packages, I wonder > how discoverable it is... orage already skipped a few releases, so > maybe it just isn't that important/used these days? Nope, orage recently got a new developer and iirc was upgraded in master. I'd eventually like it to get revived and reenabled in the meta package.
Re: meta/xfce: remove calendar (orage) from DESCR-main
Le Thu, Dec 22, 2022 at 07:30:03PM +0100, Landry Breuil a écrit :
> Le Thu, Dec 22, 2022 at 05:12:39PM +, Klemens Nanni a écrit :
> > The dependency was removed in the 4.14 update and nothing depends on
> > x11/xfce4/orage these days.
> >
> > I wouldn't miss it in neither the main meta/xfce nor the -extras meta
> > package: the tray plugin provides a drop-down calendar version on click
> > which looks just like the standalone GUI provided by orage.
> >
> > Then again, if it isn't installed by any of the meta packages, I wonder
> > how discoverable it is... orage already skipped a few releases, so
> > maybe it just isn't that important/used these days?
>
> Nope, orage recently got a new developer and iirc was upgraded in
> master. I'd eventually like it to get revived and reenabled in the meta
> package.
And here's a diff - starts here, but i dont use it otherwise..
dropped panel plugin and globaltime app, cf
https://gitlab.xfce.org/apps/orage/-/blob/master/NEWS#L1
Index: Makefile
===
RCS file: /cvs/ports/x11/xfce4/orage/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- Makefile15 Dec 2022 14:51:02 - 1.65
+++ Makefile23 Dec 2022 14:38:44 -
@@ -1,8 +1,8 @@
COMMENT= Xfce4 calendar
-XFCE_VERSION= 4.16.0
+XFCE_VERSION= 4.17.0pre0
+XFCE_COMMIT= cf27a483c40188bb
XFCE_GOODIE= orage
-REVISION= 1
# GPLv2
PERMIT_PACKAGE=Yes
@@ -10,23 +10,21 @@
MODULES= x11/xfce4
MODXFCE_DESKTOP_FILE= Yes
MODXFCE_ICON_CACHE=Yes
-MODXFCE_PURGE_LA= lib/xfce4/panel/plugins
RUN_DEPENDS= misc/shared-mime-info
-LIB_DEPENDS = x11/xfce4/xfce4-panel \
+LIB_DEPENDS = x11/xfce4/libxfce4ui \
textproc/libical \
- devel/libnotify \
- x11/dbus-glib
+ devel/libnotify
WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 X11-xcb Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
-WANTLIB += dbus-1 dbus-glib-1 epoxy execinfo expat ffi fontconfig
+WANTLIB += dbus-1 epoxy execinfo expat ffi fontconfig
WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gtk-3 harfbuzz iconv
WANTLIB += intl jpeg m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre2-8 pixman-1 png startup-notification-1 xcb xcb-render
-WANTLIB += xcb-shm xcb-util xfce4panel-2.0 xfce4ui-2 xfce4util
+WANTLIB += xcb-shm xcb-util xfce4ui-2 xfce4util
WANTLIB += db db_cxx ical icalss icalvcal icudata icui18n icuuc z
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/xfce4/orage/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo16 Apr 2022 06:48:21 - 1.14
+++ distinfo23 Dec 2022 14:38:44 -
@@ -1,2 +1,2 @@
-SHA256 (xfce4/orage-4.16.0.tar.bz2) =
JhEaO2ogB8gvHgoeBZG3dKCxMvOn8c3lPZvmYbLxFwA=
-SIZE (xfce4/orage-4.16.0.tar.bz2) = 2054409
+SHA256 (xfce4/orage-cf27a483c40188bb.tar.bz2) =
9ZB01BWSJHC9yKjKYoCO+GJtulzeOGKmJltoBvMLl4Y=
+SIZE (xfce4/orage-cf27a483c40188bb.tar.bz2) = 1092832
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/xfce4/orage/pkg/PLIST,v
retrieving revision 1.23
diff -u -r1.23 PLIST
--- pkg/PLIST 16 Apr 2022 06:48:21 - 1.23
+++ pkg/PLIST 23 Dec 2022 14:38:44 -
@@ -1,24 +1,13 @@
-@bin bin/globaltime
@bin bin/orage
-@so lib/xfce4/panel/plugins/liborageclock.so
share/applications/org.xfce.orage-settings.desktop
share/applications/org.xfce.orage.desktop
-share/applications/org.xfce.orage.globaltime.desktop
share/dbus-1/services/org.xfce.orage.service
share/icons/hicolor/128x128/apps/org.xfce.orage.png
-share/icons/hicolor/160x160/
-share/icons/hicolor/160x160/apps/
-share/icons/hicolor/160x160/apps/org.xfce.orage.xpm
-share/icons/hicolor/160x160/apps/org.xfce.orage_ice.xpm
-share/icons/hicolor/160x160/apps/org.xfce.orage_round.xpm
-share/icons/hicolor/160x160/apps/org.xfce.orage_sun.xpm
share/icons/hicolor/16x16/apps/org.xfce.orage.png
share/icons/hicolor/24x24/apps/org.xfce.orage.png
share/icons/hicolor/32x32/apps/org.xfce.orage.png
-share/icons/hicolor/48x48/apps/org.xfce.orage.globaltime.png
share/icons/hicolor/48x48/apps/org.xfce.orage.png
share/icons/hicolor/64x64/apps/org.xfce.orage.png
-share/icons/hicolor/scalable/apps/org.xfce.orage.globaltime.svg
share/icons/hicolor/scalable/apps/org.xfce.orage.svg
share/locale/am/LC_MESSAGES/orage.mo
share/locale/ar/LC_MESSAGES/orage.mo
@@ -87,6 +76,5 @@
share/orage/sounds/Spo.wav
share/orage/sounds/Tear.wav
share/orage/sounds/Wall_c.wav
-share/xfce4/panel/plugins/org.xfce.orage.clock-plugin.desktop
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
Re: meta/xfce: remove calendar (orage) from DESCR-main
12/23/22 18:46, Landry Breuil пишет: > Le Thu, Dec 22, 2022 at 07:30:03PM +0100, Landry Breuil a écrit : >> Le Thu, Dec 22, 2022 at 05:12:39PM +, Klemens Nanni a écrit : >>> The dependency was removed in the 4.14 update and nothing depends on >>> x11/xfce4/orage these days. >>> >>> I wouldn't miss it in neither the main meta/xfce nor the -extras meta >>> package: the tray plugin provides a drop-down calendar version on click >>> which looks just like the standalone GUI provided by orage. >>> >>> Then again, if it isn't installed by any of the meta packages, I wonder >>> how discoverable it is... orage already skipped a few releases, so >>> maybe it just isn't that important/used these days? >> >> Nope, orage recently got a new developer and iirc was upgraded in >> master. I'd eventually like it to get revived and reenabled in the meta >> package. > > And here's a diff - starts here, but i dont use it otherwise.. Same, never used orage. It can apparently im/export .ics files, but not sync via CalDAV. > dropped panel plugin and globaltime app, cf > https://gitlab.xfce.org/apps/orage/-/blob/master/NEWS#L1 The DateTime tray plugin outside of orage provides decent functionality, so that doesn't seem to much of a bummer. OK kn for the update. Nothing installs it now but meta/xfce,-main DESCR mentions it. How about shipping it through the -extras package? orage certainly doesn't seem required to me.
Re: meta/xfce: remove calendar (orage) from DESCR-main
On Fri, Dec 23, 2022 at 07:03:34PM +, Klemens Nanni wrote:
> Nothing installs it now but meta/xfce,-main DESCR mentions it.
> How about shipping it through the -extras package?
> orage certainly doesn't seem required to me.
Like this. xfce4-datetime is currently installed through the -extras
package, so having it install orage as well makes sense to me.
Index: Makefile
===
RCS file: /cvs/ports/meta/xfce/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile22 Dec 2022 18:21:50 - 1.26
+++ Makefile23 Dec 2022 19:05:30 -
@@ -6,8 +6,8 @@ PKGNAME=xfce-${V}
PKGNAME-main = xfce-${V}
PKGNAME-extras = xfce-extras-${V}
-REVISION-extras = 0
-REVISION-main =1
+REVISION-extras = 1
+REVISION-main =2
MAINTAINER = Landry Breuil
@@ -46,6 +46,7 @@ RUN_DEPENDS-extras += \
STEM-=${V}:${BASE_PKGPATH},-main \
textproc/catfish \
x11/gigolo \
+ x11/xfce4/orage \
x11/xfce4/xfdashboard \
x11/xfce4/xfmpc \
x11/xfce4/parole
Index: pkg/DESCR-extras
===
RCS file: /cvs/ports/meta/xfce/pkg/DESCR-extras,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-extras
--- pkg/DESCR-extras10 Aug 2013 23:17:42 - 1.2
+++ pkg/DESCR-extras23 Dec 2022 19:06:11 -
@@ -1,5 +1,6 @@
The Xfce Desktop Environment, full installation. Contains base Xfce plus:
* a media player (parole)
* an mpc client (xfmpc)
+ * a calendar (orage)
* a lot of panel plugins
* thunar plugins (archive, media-tags, thumbnailers and vcs)
Index: pkg/DESCR-main
===
RCS file: /cvs/ports/meta/xfce/pkg/DESCR-main,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-main
--- pkg/DESCR-main 10 Aug 2013 23:17:42 - 1.2
+++ pkg/DESCR-main 23 Dec 2022 19:06:13 -
@@ -1,7 +1,6 @@
The Xfce Desktop Environment, base installation. Contains core Xfce plus:
* theme packages
* a terminal (xfce4-terminal)
- * a calendar (orage)
* an image viewer (ristretto)
* a text editor (mousepad)
* a sound mixer (xfce4-mixer)
Re: meta/xfce: remove calendar (orage) from DESCR-main
Le Fri, Dec 23, 2022 at 07:07:34PM +, Klemens Nanni a écrit : > On Fri, Dec 23, 2022 at 07:03:34PM +, Klemens Nanni wrote: > > Nothing installs it now but meta/xfce,-main DESCR mentions it. > > How about shipping it through the -extras package? > > orage certainly doesn't seem required to me. > > Like this. xfce4-datetime is currently installed through the -extras > package, so having it install orage as well makes sense to me. Yeah, why not.. it will only add libical to the global dependencies of xfce-extras. Technically, datetime plugin is now deprecated/abandoned and i'd like to remove it at some point, i was using it instead of the default panel clock plugin for a long time but the latter received all the features that were missing in 4.18, and at the beginning datetime was a fork of the default panel clock plugin.. cf https://mail.xfce.org/pipermail/xfce4-dev/2022-June/032927.html Landry
Re: meta/xfce: remove calendar (orage) from DESCR-main
12/24/22 11:43, Landry Breuil пишет: > Technically, datetime plugin is now deprecated/abandoned and i'd like to > remove it at some point, i was using it instead of the default panel > clock plugin for a long time but the latter received all the features > that were missing in 4.18, and at the beginning datetime was a fork of > the default panel clock plugin.. > > cf https://mail.xfce.org/pipermail/xfce4-dev/2022-June/032927.html Oh, I'm also using the clock plugin instead of datetime. The names tripped me up.
