git: 4a4767c187c5 - main - x11/fbdesk: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Jan 2025 21:08:06 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4a4767c187c5d74423496b6f3b22388d0a6b5dec
commit 4a4767c187c5d74423496b6f3b22388d0a6b5dec
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2025-01-27 21:08:01 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2025-01-27 21:08:01 +0000
x11/fbdesk: Remove expired port
2025-01-27 x11/fbdesk: Upstream disapear and distfile is no more available
---
MOVED | 1 +
x11/Makefile | 1 -
x11/fbdesk/Makefile | 35 -------
x11/fbdesk/distinfo | 2 -
x11/fbdesk/files/patch-ImagePNG.cc | 153 -------------------------------
x11/fbdesk/files/patch-TextBox.cc | 11 ---
x11/fbdesk/files/patch-src_FbTk_Image.cc | 19 ----
x11/fbdesk/pkg-descr | 12 ---
8 files changed, 1 insertion(+), 233 deletions(-)
diff --git a/MOVED b/MOVED
index bb2c832d8da7..932bd770c6ea 100644
--- a/MOVED
+++ b/MOVED
@@ -4053,3 +4053,4 @@ chinese/eterm||2025-01-27|Has expired: Depends on kcfonts, which is marked DEPRE
mail/queue-fix||2025-01-27|Has expired: Upstream disapeared and distfile is no more available
games/senken||2025-01-27|Has expired: GENTOO mastersites are no longer available
chinese/kcfonts||2025-01-27|Has expired: GENTOO MASTER_SITES are no longer available
+x11/fbdesk||2025-01-27|Has expired: Upstream disapear and distfile is no more available
diff --git a/x11/Makefile b/x11/Makefile
index 5f1516311f0a..f7686018b600 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -80,7 +80,6 @@
SUBDIR += evilvte
SUBDIR += evtest
SUBDIR += eww
- SUBDIR += fbdesk
SUBDIR += fbpanel
SUBDIR += find-cursor
SUBDIR += fireflies
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
deleted file mode 100644
index 533871187677..000000000000
--- a/x11/fbdesk/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-PORTNAME= fbdesk
-PORTVERSION= 1.4.1
-PORTREVISION= 8
-CATEGORIES= x11
-MASTER_SITES= http://fluxbox.sourceforge.net/download/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Fluxbox utility to create and manage icons on the desktop
-WWW= https://fluxbox.sourceforge.net/fbdesk/
-
-LICENSE= MIT
-
-DEPRECATED= Upstream disapear and distfile is no more available
-EXPIRATION_DATE=2025-01-27
-
-LIB_DEPENDS= libpng.so:graphics/png \
- libImlib2.so:graphics/imlib2
-
-USES= pkgconfig xorg
-USE_CXXSTD= c++14
-USE_XORG= xext xft xpm xrender
-
-GNU_CONFIGURE= yes
-
-PORTDOCS= ChangeLog INSTALL README
-
-PLIST_FILES= bin/fbdesk
-
-OPTIONS_DEFINE= DOCS
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/x11/fbdesk/distinfo b/x11/fbdesk/distinfo
deleted file mode 100644
index a6b7e7dbded8..000000000000
--- a/x11/fbdesk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fbdesk-1.4.1.tar.gz) = ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c
-SIZE (fbdesk-1.4.1.tar.gz) = 426550
diff --git a/x11/fbdesk/files/patch-ImagePNG.cc b/x11/fbdesk/files/patch-ImagePNG.cc
deleted file mode 100644
index 6abe43eb39e2..000000000000
--- a/x11/fbdesk/files/patch-ImagePNG.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2013/02/26 10:19:28 joerg Exp $
-
-Fix build with png-1.5.
-
---- src/FbTk/ImagePNG.cc.orig 2004-09-20 14:04:11.000000000 +0000
-+++ src/FbTk/ImagePNG.cc
-@@ -28,6 +28,7 @@
- #include "PixmapWithMask.hh"
-
- #include <png.h>
-+#include <cstring>
- #include <cstdio>
- #include <iostream>
- using namespace std;
-@@ -76,6 +77,8 @@ ImagePNG::~ImagePNG() {
- }
-
- PixmapWithMask *ImagePNG::load(const std::string &filename, int screen_num) const {
-+ int pixel_depth;
-+ int rowbytes;
- if (filename.empty())
- return 0;
- #ifdef DEBUG
-@@ -102,7 +105,7 @@ PixmapWithMask *ImagePNG::load(const std
- return 0;
- }
-
-- if (setjmp(png.png()->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png.png()))) {
- fclose(fp);
- return 0;
- }
-@@ -115,12 +118,14 @@ PixmapWithMask *ImagePNG::load(const std
- png_get_IHDR(png.png(), png.info(), &w, &h,
- &bit_depth, &color_type,
- &interlace_type, 0, 0);
-+ pixel_depth = bit_depth * png_get_channels(png.png(), png.info());
-+ rowbytes = png_get_rowbytes(png.png(), png.info());
- #ifdef DEBUG
-- cerr<<png.info()->width<<", "<<png.info()->height<<endl;
-- cerr<<"bit_depth = "<<(int)png.info()->bit_depth<<endl;
-- cerr<<"bytes per pixel = "<<((int)png.info()->bit_depth>>3)<<endl;
-- cerr<<"pixel depth = "<<(int)png.info()->pixel_depth<<endl;
-- cerr<<"rowbytes = "<<png.info()->rowbytes<<endl;
-+ cerr<<png_get_image_width(png.png(), png.info())<<", "<<png_get_image_height(png.png(), png.info())<<endl;
-+ cerr<<"bit_depth = "<<(int)png_get_bit_depth(png.png(),png.info())<<endl;
-+ cerr<<"bytes per pixel = "<<((int)png_get_bit_depth(png.png(), png.info())>>3)<<endl;
-+ cerr<<"pixel depth = "<<pixel_depth<<endl;
-+ cerr<<"rowbytes = "<<rowbytes<<endl;
- cerr<<"Color type = ";
- switch (color_type) {
- case PNG_COLOR_TYPE_GRAY:
-@@ -146,7 +151,7 @@ PixmapWithMask *ImagePNG::load(const std
- // convert to rgb
- if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth <= 8) {
- png_set_expand(png.png());
-- png.info()->pixel_depth = 8;
-+ pixel_depth = 8;
- }
- // convert to rgb
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-@@ -158,7 +163,7 @@ PixmapWithMask *ImagePNG::load(const std
- if (color_type == PNG_COLOR_TYPE_GRAY ||
- color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
- png_set_gray_to_rgb(png.png());
-- png.info()->pixel_depth = 8;
-+ pixel_depth = 8;
- color_type = PNG_COLOR_TYPE_RGB;
- }
-
-@@ -170,23 +175,23 @@ PixmapWithMask *ImagePNG::load(const std
- // expand to 4 bytes
- if (bit_depth == 8 && color_type == PNG_COLOR_TYPE_RGB) {
- png_set_filler(png.png(), 0, PNG_FILLER_AFTER);
-- png.info()->rowbytes = png.info()->width * 4;
-- png.info()->pixel_depth = 32;
-+ rowbytes = png_get_image_width(png.png(), png.info()) * 4;
-+ pixel_depth = 32;
- }
-
-- if (png.info()->pixel_depth == 4 ||
-- png.info()->pixel_depth == 8)
-+ if (pixel_depth == 4 ||
-+ pixel_depth == 8)
- return 0;
-
- // create memory to hold rows
-- png_bytep *row_pointers = new (nothrow) png_bytep[png.info()->height];
-+ png_bytep *row_pointers = new (nothrow) png_bytep[png_get_image_height(png.png(), png.info())];
- if (row_pointers == 0) {
- fclose(fp);
- return 0;
- }
-
-- for (unsigned int row = 0; row < png.info()->height; ++row) {
-- row_pointers[row] = new png_byte[png.info()->rowbytes];
-+ for (unsigned int row = 0; row < png_get_image_height(png.png(), png.info()); ++row) {
-+ row_pointers[row] = new png_byte[rowbytes];
- }
-
- // get transparent pixel
-@@ -214,31 +219,31 @@ PixmapWithMask *ImagePNG::load(const std
- fclose(fp);
-
- // clear linear memory
-- char *data = new char[png.info()->rowbytes * png.info()->height];
-- for (int offset=0, y = 0; y < png.info()->height; y++) {
-- for (int x = 0; x < png.info()->rowbytes; x++, offset++) {
-+ char *data = new char[rowbytes * png_get_image_height(png.png(), png.info())];
-+ for (int offset=0, y = 0; y < png_get_image_height(png.png(), png.info()); y++) {
-+ for (int x = 0; x < rowbytes; x++, offset++) {
- data[offset] = row_pointers[y][x];
- }
- }
-
-- FbTk::Surface *srf = new (nothrow) FbTk::Surface(png.info()->width, png.info()->height,
-- png.info()->pixel_depth);
-+ FbTk::Surface *srf = new (nothrow) FbTk::Surface(png_get_image_width(png.png(), png.info()), png_get_image_height(png.png(), png.info()),
-+ pixel_depth);
-
- if (srf == 0)
- return 0;
-
-
- // finaly copy data to surface
-- switch (png.info()->pixel_depth) {
-+ switch (pixel_depth) {
- case 16:
- convert16to32(data, *srf);
- break;
- case 24:
- case 32:
-- memcpy(srf->data(), data, png.info()->height * png.info()->rowbytes);
-+ memcpy(srf->data(), data, png_get_image_height(png.png(), png.info()) * rowbytes);
- break;
- default:
-- cerr<<"ImagePNG: Can't convert from "<<(int)png.info()->pixel_depth<<" to 32bpp."<<endl;
-+ cerr<<"ImagePNG: Can't convert from "<<pixel_depth<<" to 32bpp."<<endl;
- break;
- }
-
-@@ -264,9 +269,9 @@ PixmapWithMask *ImagePNG::load(const std
- long i = 0x44332211;
- unsigned char* a = (unsigned char*) &i;
- bool big_endian = (*a != 0x11);
-- int alphacolor = ((png.info()->channels != 4) ? 0xFF000000 : 0);
-+ int alphacolor = ((png_get_channels(png.png(), png.info()) != 4) ? 0xFF000000 : 0);
- if (big_endian) {
-- int shift = ((png.info()->channels == 4) ? 0 : 8);
-+ int shift = ((png_get_channels(png.png(), png.info()) == 4) ? 0 : 8);
- alphacolor = (0xFF >> shift);
- }
- screen_surf.setColorKey(alphacolor, true);
diff --git a/x11/fbdesk/files/patch-TextBox.cc b/x11/fbdesk/files/patch-TextBox.cc
deleted file mode 100644
index 8f6fe7ef616d..000000000000
--- a/x11/fbdesk/files/patch-TextBox.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/FbTk/TextBox.cc.orig 2006-03-25 15:42:00 UTC
-+++ src/FbTk/TextBox.cc
-@@ -199,7 +199,7 @@ void TextBox::buttonPressEvent(XButtonEv
- int delta = width();
- int tmp = 0;
- for(i = m_start_pos; i <= m_end_pos; i++) {
-- tmp = abs(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
-+ tmp = abs((int)(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos)));
-
- if (tmp < delta) {
- delta = tmp;
diff --git a/x11/fbdesk/files/patch-src_FbTk_Image.cc b/x11/fbdesk/files/patch-src_FbTk_Image.cc
deleted file mode 100644
index 41480233b7af..000000000000
--- a/x11/fbdesk/files/patch-src_FbTk_Image.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/FbTk/Image.cc.orig 2018-08-28 13:45:07 UTC
-+++ src/FbTk/Image.cc
-@@ -85,14 +85,14 @@ PixmapWithMask *Image::load(const std::string &filenam
-
-
- if (filename == "")
-- return false;
-+ return NULL;
-
- // determine file ending
- std::string extension(StringUtil::toUpper(StringUtil::findExtension(filename)));
-
- // valid handle?
- if (s_image_map.find(extension) == s_image_map.end())
-- return false;
-+ return NULL;
-
- // load file
- PixmapWithMask *pm = s_image_map[extension]->load(filename, screen_num);
diff --git a/x11/fbdesk/pkg-descr b/x11/fbdesk/pkg-descr
deleted file mode 100644
index dca32c420862..000000000000
--- a/x11/fbdesk/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-fbdesk is a small application designed for the Fluxbox windowmanager that
-allows management of icons on the desktop.
-
-current features:
-
- o XPM and PNG image loading
- o Antialias text
- o UTF-8 and multibyte support
- o Vertical text
- o Grid snapping
- o GUI for icon management
- o Fluxbox menu style