cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove discwrapper, broken after the wxWidgets3 update

Browse Source 
Last release was in 2009 and its usefulness is limited anyway (use
glabels or the gimp, etc).

ok ajacoutot@ kn@ landry@
This commit is contained in:
jca 2019-01-02 12:58:11 +00:00
parent fcf737c34f
commit fee1c35d8f
11 changed files with 5 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.680 2019/01/02 12:46:21 jca Exp $
# $OpenBSD: Makefile,v 1.681 2019/01/02 12:58:11 jca Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.73
PKGNAME = quirks-3.74
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.694 2019/01/02 12:46:21 jca Exp $
# $OpenBSD: Quirks.pm,v 1.695 2019/01/02 12:58:11 jca Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -1136,6 +1136,7 @@ my $obsolete_reason = {
'emerillon' => 3,
'mplex' => 5,
'gromit' => 0,
'discwrapper' => 3,
};
# reasons for obsolete packages

3
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.467 2018/12/24 23:08:49 bentley Exp $
# $OpenBSD: Makefile,v 1.468 2019/01/02 12:58:11 jca Exp $
SUBDIR =
SUBDIR += DevIL
@ -38,7 +38,6 @@
SUBDIR += dia
SUBDIR += dibuja
SUBDIR += digikam-kde4
SUBDIR += discwrapper
SUBDIR += displaz
SUBDIR += djview4
SUBDIR += djvulibre

36
graphics/discwrapper/Makefile
View File

@ -1,36 +0,0 @@
# $OpenBSD: Makefile,v 1.13 2019/01/02 12:44:53 jca Exp $
# lots of wxWidgets-related errors
BROKEN= ./Database.h:60:9: error: unknown type name 'wxFontData'
COMMENT= disc cover designer
DISTNAME= discwrapper-1.2.2
REVISION = 4
CATEGORIES= graphics
HOMEPAGE= http://discwrapper.sourceforge.net/
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=discwrapper/}
WANTLIB += c m pthread ${COMPILER_LIBCXX}
WANTLIB += wx_base>=1 wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv
WANTLIB += wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
WANTLIB += wx_gtk2_richtext wx_gtk2_xrc
COMPILER = base-clang ports-gcc base-gcc
RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info>=0.21
LIB_DEPENDS= x11/wxWidgets
CONFIGURE_STYLE=gnu
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/DiscWrapperApp.cpp
.include <bsd.port.mk>

2
graphics/discwrapper/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (discwrapper-1.2.2.tar.gz) = YSl1d6w81niTFn+8qK7Wdk+F+KsgdgB4sNouo5cKkeY=
SIZE (discwrapper-1.2.2.tar.gz) = 669244

15
graphics/discwrapper/patches/patch-configure
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/08/07 14:14:59 ajacoutot Exp $
Our wxWidgets version is a bit older than the requested one.
--- configure.orig Sun Jun 21 14:25:23 2009
+++ configure Fri Aug 7 14:30:32 2009
@@ -3173,7 +3173,7 @@ else
fi
-reqwx=2.8.8
+reqwx=2.8.7
if test x${WX_CONFIG_NAME+set} != xset ; then
WX_CONFIG_NAME=wx-config

61
graphics/discwrapper/patches/patch-src_DiscWrapperApp_cpp
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-src_DiscWrapperApp_cpp,v 1.1.1.1 2009/08/07 14:14:59 ajacoutot Exp $
XXX locales does not play nice on OpenBSD.
Do not hardcode paths.
--- src/DiscWrapperApp.cpp.orig Sun Jun 7 23:31:54 2009
+++ src/DiscWrapperApp.cpp Fri Aug 7 16:08:20 2009
@@ -45,27 +45,6 @@ bool DiscWrapperApp::OnInit()
wxFile file;
wxString path, tipsdir;
int LANG = wxLANGUAGE_DEFAULT;
- switch(wxLocale::GetSystemLanguage()){
- case wxLANGUAGE_GERMAN:
- case wxLANGUAGE_GERMAN_AUSTRIAN:
- case wxLANGUAGE_GERMAN_BELGIUM:
- case wxLANGUAGE_GERMAN_LIECHTENSTEIN:
- case wxLANGUAGE_GERMAN_LUXEMBOURG:
- case wxLANGUAGE_GERMAN_SWISS:
- LANG = wxLANGUAGE_GERMAN;
- break;
- case wxLANGUAGE_ENGLISH:
- case wxLANGUAGE_HUNGARIAN:
- case wxLANGUAGE_DANISH:
- case wxLANGUAGE_SPANISH:
- case wxLANGUAGE_SWEDISH:
- case wxLANGUAGE_POLISH:
- LANG = wxLANGUAGE_GERMAN;
- break;
- default:
- LANG = wxLANGUAGE_ENGLISH;
- break;
- }
CFs.LocalDir();
@@ -89,11 +68,11 @@ bool DiscWrapperApp::OnInit()
}
- m_locale = new wxLocale( LANG );
+ m_locale = new wxLocale( wxLANGUAGE_DEFAULT );
#if defined(__UNIX__)
- if ( wxFile::Exists(_T("/usr/local/share/discwrapper/printermodels")) == true )
- path = _T("/usr/local/share/discwrapper/po");
+ if ( wxFile::Exists(_T("${LOCALBASE}/share/discwrapper/printermodels")) == true )
+ path = _T("${LOCALBASE}/share/discwrapper/po");
else
path = _T("/usr/share/discwrapper/po");
#elif defined(__WXMSW__)
@@ -164,8 +143,8 @@ bool DiscWrapperApp::OnInit()
}
#if defined(__UNIX__)
- if ( wxFile::Exists(_T("/usr/local/share/discwrapper/printermodels")) == true )
- path = _T("/usr/local/share/discwrapper");
+ if ( wxFile::Exists(_T("${LOCALBASE}/share/discwrapper/printermodels")) == true )
+ path = _T("${LOCALBASE}/share/discwrapper");
else
path = _T("/usr/share/discwrapper");
#elif defined(__WXMSW__)

41
graphics/discwrapper/patches/patch-src_MouseHandling_cpp
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-src_MouseHandling_cpp,v 1.1 2018/04/16 15:49:30 naddy Exp $
Index: src/MouseHandling.cpp
--- src/MouseHandling.cpp.orig
+++ src/MouseHandling.cpp
@@ -88,7 +88,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont()); // Apply Font and Color then draw text with the chosen coordinates and angle
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
- wxCoord wi, he, xc = NULL;
+ wxCoord wi, he, xc = 0;
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
if ( wi == 0 )
wi = he = 100;
@@ -423,7 +423,7 @@ void DiscWrapperFrame::OnLeftDown(wxMouseEvent& event)
dc.SetFont(Database->Page[Cpage].labels[i].Font.GetChosenFont()); // Apply Font and Color then draw text with the chosen coordinates and angle
dc.SetTextForeground(Database->Page[Cpage].labels[i].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- wxCoord w, h, xc = NULL;
+ wxCoord w, h, xc = 0;
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[i].L, & w, & h, &xc, &Xfont);
if ( w == 0 )
w = h = 100 ;
@@ -652,7 +652,7 @@ void DiscWrapperFrame::OnDragging(wxMouseEvent& event)
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont()); // Apply Font and Color then draw text with the chosen coordinates and angle
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
- wxCoord wi, he, xc = NULL;
+ wxCoord wi, he, xc = 0;
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
if ( wi == 0 )
wi = he = 100;
@@ -1664,7 +1664,7 @@ void DiscWrapperFrame::OnLeftDouble(wxMouseEvent& even
dc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont()); // Apply Font and Color then draw text with the chosen coordinates and angle
dc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
- wxCoord wi, he, xc = NULL;
+ wxCoord wi, he, xc = 0;
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
if ( wi == 0 )
wi = he = 100;

68
graphics/discwrapper/patches/patch-src_PreviewOutput_cpp
View File

@ -1,68 +0,0 @@
$OpenBSD: patch-src_PreviewOutput_cpp,v 1.1 2018/04/16 15:49:30 naddy Exp $
Index: src/PreviewOutput.cpp
--- src/PreviewOutput.cpp.orig
+++ src/PreviewOutput.cpp
@@ -324,7 +324,7 @@ void DiscWrapperFrame::DrawDC() // The Drawing stuf
pdc.SetFont(Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont()); // Apply Font && Color then draw text with the chosen coordinates && angle
pdc.SetTextForeground(Database->Page[Cpage].labels[SelectedItem].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[SelectedItem].Font.GetChosenFont();
- wxCoord wi, he, xc = NULL;
+ wxCoord wi, he, xc = 0;
pdc.GetMultiLineTextExtent(Database->Page[Cpage].labels[SelectedItem].L, & wi, & he, &xc, &Xfont);
if ( wi == 0 )
wi = he = 100 ;
@@ -894,7 +894,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
dc.SetFont(Database->Page[Cpage].labels[i].Font.GetChosenFont()); // Apply Font && Color then draw text with the chosen coordinates && angle
dc.SetTextForeground(Database->Page[Cpage].labels[i].Colour.GetColour());
wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- wxCoord w, oh, h, xc = NULL;
+ wxCoord w, oh, h, xc = 0;
dc.GetMultiLineTextExtent(Database->Page[Cpage].labels[i].L, & w, & oh, &xc, &Xfont);
if ( ( (Database->Page[Cpage].labels[i].L == _("<Title>")) || (Database->Page[Cpage].labels[i].L == _("<Date>")) ) && !preview )
@@ -919,7 +919,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
ih = ig+1;
wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- xc = NULL;
+ xc = 0;
dc.GetMultiLineTextExtent(DrawL, & w, & oh, &xc, &Xfont);
if ( Database->Page[Cpage].labels[i].Align == 0 )
@@ -949,7 +949,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
ih = ig+1;
wxFont Xfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- xc = NULL;
+ xc = 0;
dc.GetMultiLineTextExtent(DrawL, & w, & oh, &xc, &Xfont);
if ( DrawY <= 416 )
@@ -964,7 +964,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
double Radius = 0;
wxFont Tfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- wxCoord cw, ch, cxc = NULL;
+ wxCoord cw, ch, cxc = 0;
for ( j = 0 ; j < DrawL.Len() ; j++ )
{
@@ -996,7 +996,7 @@ void DiscWrapperFrame::DrawLabels(wxDC &dc, int Cpage,
double Radius = 0;
wxFont Tfont = Database->Page[Cpage].labels[i].Font.GetChosenFont();
- wxCoord cw, ch, cxc = NULL;
+ wxCoord cw, ch, cxc = 0;
for ( j = 0 ; j < DrawL.Len() ; j++ )
{
@@ -1090,7 +1090,7 @@ void DiscWrapperFrame::DrawLists(wxDC &dc, int Cpage,
TempString = _("<Empty>");
wxFont Xfont = Database->Page[Cpage].lists[i].Font.GetChosenFont();
- wxCoord w, h, xc = NULL;
+ wxCoord w, h, xc = 0;
dc.GetMultiLineTextExtent(TempString, & w, & h, &xc, &Xfont);
if ( align == 'l' )
dc.DrawText( TempString, Database->Page[Cpage].lists[i].X+ColWidth, Database->Page[Cpage].lists[i].Y+((j-1)*Database->Page[Cpage].lists[i].Font.GetChosenFont().GetPointSize()*1.5));

2
graphics/discwrapper/pkg/DESCR
View File

@ -1,2 +0,0 @@
DiscWrapper is a cover designer for homemade discs. It supports standard
CD-DVD, slim CD-DVD cases and disc designing.

92
graphics/discwrapper/pkg/PLIST
View File

@ -1,92 +0,0 @@
@comment $OpenBSD: PLIST,v 1.4 2018/07/01 18:33:36 espie Exp $
@bin bin/discwrapper
share/applications/discwrapper.desktop
share/discwrapper/
share/discwrapper/License.txt
share/discwrapper/icons/
share/discwrapper/icons/CD-Slim.png
share/discwrapper/icons/CD-Standard.png
share/discwrapper/icons/DVD-Slim.png
share/discwrapper/icons/DVD-Standard.png
share/discwrapper/icons/DW-icon.png
share/discwrapper/icons/button/
share/discwrapper/icons/button/acenter.png
share/discwrapper/icons/button/aleft.png
share/discwrapper/icons/button/aright.png
share/discwrapper/icons/button/colour.png
share/discwrapper/icons/button/fit.png
share/discwrapper/icons/button/font.png
share/discwrapper/icons/button/pdown.png
share/discwrapper/icons/button/pup.png
share/discwrapper/icons/cursor/
share/discwrapper/icons/cursor/ES.png
share/discwrapper/icons/cursor/NE.png
share/discwrapper/icons/cursor/NESW.png
share/discwrapper/icons/cursor/NSWE.png
share/discwrapper/icons/cursor/NWSE.png
share/discwrapper/icons/cursor/SW.png
share/discwrapper/icons/cursor/WE.png
share/discwrapper/icons/cursor/WN.png
share/discwrapper/icons/menu/
share/discwrapper/icons/menu/export.png
share/discwrapper/icons/menu/gtk-about.png
share/discwrapper/icons/menu/view-refresh_s.png
share/discwrapper/icons/menu/window-close.png
share/discwrapper/icons/menu/zoom-fit-best_b.png
share/discwrapper/icons/menu/zoom-fit-best_s.png
share/discwrapper/icons/menu/zoom-in_b.png
share/discwrapper/icons/menu/zoom-in_s.png
share/discwrapper/icons/menu/zoom-out_b.png
share/discwrapper/icons/menu/zoom-out_s.png
share/discwrapper/imagestore/
share/discwrapper/imagestore/a_Data_yellow.png
share/discwrapper/imagestore/b_Photos-yellow.png
share/discwrapper/imagestore/c_Music_notes.png
share/discwrapper/patterns/
share/discwrapper/patterns/ntfou.jpg
share/discwrapper/patterns/wtres.jpg
share/discwrapper/po/
share/discwrapper/po/da/
share/discwrapper/po/da/discwrapper.mo
share/discwrapper/po/da/discwrapper.po
share/discwrapper/po/da/tips.txt
share/discwrapper/po/de/
share/discwrapper/po/de/discwrapper.mo
share/discwrapper/po/de/discwrapper.po
share/discwrapper/po/de/tips.txt
share/discwrapper/po/en/
share/discwrapper/po/en/tips.txt
share/discwrapper/po/es/
share/discwrapper/po/es/discwrapper.mo
share/discwrapper/po/es/discwrapper.po
share/discwrapper/po/es/tips.txt
share/discwrapper/po/hu/
share/discwrapper/po/hu/discwrapper.mo
share/discwrapper/po/hu/discwrapper.po
share/discwrapper/po/hu/tips.txt
share/discwrapper/po/pl/
share/discwrapper/po/pl/discwrapper.mo
share/discwrapper/po/pl/discwrapper.po
share/discwrapper/po/pl/tips.txt
share/discwrapper/po/sv/
share/discwrapper/po/sv/discwrapper.mo
share/discwrapper/po/sv/discwrapper.po
share/discwrapper/po/sv/tips.txt
share/discwrapper/printermodels
share/discwrapper/templates/
share/discwrapper/templates/no-background/
share/discwrapper/templates/no-background.dwtp
share/discwrapper/templates/no-background/no-background.dwt
share/discwrapper/templates/no-background/thumbnail.jpg
share/discwrapper/templates/simple-design/
share/discwrapper/templates/simple-design.dwtp
share/discwrapper/templates/simple-design/cdmain.jpg
share/discwrapper/templates/simple-design/dvdsl.jpg
share/discwrapper/templates/simple-design/dvdst.jpg
share/discwrapper/templates/simple-design/simple-design.dwt
share/discwrapper/templates/simple-design/thumbnail.jpg
share/mime/packages/discwrapper.xml
share/pixmaps/
share/pixmaps/discwrapper.png
@tag update-mime-database
@tag update-desktop-database