Hello community, here is the log from the commit of package sffview checked in at Mon Oct 16 11:05:54 CEST 2006. -------- --- sffview/sffview.changes 2006-01-27 11:41:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/sffview/sffview.changes 2006-10-16 09:08:17.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 16 09:05:59 CEST 2006 - kkeil@suse.de + +- compile with RPM_OPT_FLAGS +- compile with unicode support (Thanks Andreas Hanke, #212502) + +------------------------------------------------------------------- New: ---- sffview-0.3-utf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sffview.spec ++++++ --- /var/tmp/diff_new_pack.PntTsa/_old 2006-10-16 10:59:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PntTsa/_new 2006-10-16 10:59:45.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Hardware/ISDN Autoreqprov: on Version: 0.3 -Release: 11 +Release: 34 Summary: Simple viewer for Structured Fax Files (.sff) used by ISDN applications Source: %{name}-%{version}.tar.bz2 URL: http://sfftools.sourceforge.net/ @@ -24,6 +24,7 @@ Patch0: %{name}-%{version}.diff Patch1: %{name}-%{version}-types.diff Patch2: %{name}-%{version}-gcc4.diff +Patch3: %{name}-%{version}-utf.diff %description The CAPI interface for programming ISDN hardware expects and gives you @@ -45,6 +46,7 @@ %patch -p1 %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 %build make @@ -64,6 +66,9 @@ %doc %{_defaultdocdir}/sffview %changelog -n sffview +* Mon Oct 16 2006 - kkeil@suse.de +- compile with RPM_OPT_FLAGS +- compile with unicode support (Thanks Andreas Hanke, #212502) * Fri Jan 27 2006 - kkeil@suse.de - add gcc-c++ to BuildRequires * Wed Jan 25 2006 - mls@suse.de ++++++ sffview-0.3-utf.diff ++++++ --- sffview-0.3.orig/sffapp.cpp +++ sffview-0.3/sffapp.cpp @@ -107,14 +107,15 @@ bool SffApp::OnInit(void) { - SetAppName("SFF Viewer"); + SetAppName(wxT("SFF Viewer")); //// Create a document manager m_docManager = new wxDocManager(); //// Create a template relating drawing documents to their views - (void) new wxDocTemplate(m_docManager, "SFF File", "*.sff;*.SFF", "", "sff", - "SFF Doc", "SFF View", CLASSINFO(SffDocument), CLASSINFO(SffView)); + (void) new wxDocTemplate(m_docManager, wxT("SFF File"), wxT("*.sff;*.SFF"), + wxT(""), wxT("sff"), wxT("SFF Doc"), wxT("SFF View"), + CLASSINFO(SffDocument), CLASSINFO(SffView)); m_docManager->SetMaxDocsOpen(2); @@ -132,9 +133,9 @@ wxMenu *file_menu = new wxMenu; file_menu->Append(new wxMenuItem(file_menu, wxID_OPEN, - "&Open...", "Opens a SFF fax file")); + wxT("&Open..."), wxT("Opens a SFF fax file"))); file_menu->Append(new wxMenuItem(file_menu, wxID_CLOSE, - "&Close", "Closes currently loaded file")); + wxT("&Close"), wxT("Closes currently loaded file"))); file_menu->AppendSeparator(); // file_menu->Append(new wxMenuItem(file_menu, wxID_PRINT, // "&Print...", "Prints the currently loaded file")); @@ -144,23 +145,23 @@ // "&Print Pre&view...", "Displays the file as it would be printed")); // file_menu->AppendSeparator(); file_menu->Append(new wxMenuItem(file_menu, wxID_EXIT, - "E&xit", "Quits the application")); + wxT("E&xit"), wxT("Quits the application"))); // A nice touch: a history of files visited. Use this menu. m_docManager->FileHistoryUseMenu(file_menu); wxMenu *view_menu = new wxMenu; view_menu->Append(new wxMenuItem(view_menu, ID_PREVPAGE, - "&Previous Page", "Displays the previous page of a multipage document")); + wxT("&Previous Page"), wxT("Displays the previous page of a multipage document"))); view_menu->Append(new wxMenuItem(view_menu, ID_NEXTPAGE, - "&Next Page", "Displays the next page of a multipage document")); + wxT("&Next Page"), wxT("Displays the next page of a multipage document"))); view_menu->AppendSeparator(); view_menu->Append(new wxMenuItem(view_menu, ID_ZOOMNORMAL, - "&Actual size", "Displays the page at normal scale")); + wxT("&Actual size"), wxT("Displays the page at normal scale"))); view_menu->Append(new wxMenuItem(view_menu, ID_ZOOMWIDTH, - "Fit &width", "Fit page width in window")); + wxT("Fit &width"), wxT("Fit page width in window"))); view_menu->Append(new wxMenuItem(view_menu, ID_ZOOMHEIGHT, - "&Fit in window", "Fit whole page in window")); + wxT("&Fit in window"), wxT("Fit whole page in window"))); /* view_menu->AppendSeparator(); view_menu->Append(new wxMenuItem(view_menu, ID_FLIPX, @@ -170,12 +171,12 @@ */ wxMenu *help_menu = new wxMenu; help_menu->Append(new wxMenuItem(view_menu, ID_ABOUT, - "&About", "Shows information about the application")); + wxT("&About"), wxT("Shows information about the application"))); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(view_menu, "&View"); - menu_bar->Append(help_menu, "&Help"); + menu_bar->Append(file_menu, wxT("&File")); + menu_bar->Append(view_menu, wxT("&View")); + menu_bar->Append(help_menu, wxT("&Help")); frame->canvas = frame->CreateCanvas((wxView *) NULL, frame); @@ -237,15 +238,15 @@ void SffFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { (void)wxMessageBox( - "This is SffView 0.3, a program to view structured fax files (sff)\n\n" + wxT("This is SffView 0.3, a program to view structured fax files (sff)\n\n" "This software and its documentation is\n" "Copyright (C) 2000-2004 Peter Schaefer-Hutter\n\n" "Permission to use, copy, modify, and distribute this software and its " "documentation for any purpose and without fee is hereby granted, provided " "that the above copyright notice appear in all copies. This software " "is provided 'as is' without expressed or implied warranty.\n\n" - "You can contact the author by email at peter.schaefer@gmx.de", - "About...", wxICON_INFORMATION | wxOK ); + "You can contact the author by email at peter.schaefer@gmx.de"), + wxT("About..."), wxICON_INFORMATION | wxOK ); } void SffFrame::RecreateToolbar() @@ -284,19 +285,25 @@ int currentX = 5; - toolBar->AddTool(wxID_OPEN, toolBarBitmaps[0], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open File"); + toolBar->AddTool(wxID_OPEN, toolBarBitmaps[0], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Open File")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(ID_PREVPAGE, toolBarBitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Previous Page"); + toolBar->AddTool(ID_PREVPAGE, toolBarBitmaps[1], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Previous Page")); currentX += width + 5; - toolBar->AddTool(ID_NEXTPAGE, toolBarBitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Next Page"); + toolBar->AddTool(ID_NEXTPAGE, toolBarBitmaps[2], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Next Page")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(ID_ZOOMNORMAL, toolBarBitmaps[10], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Actual Size"); + toolBar->AddTool(ID_ZOOMNORMAL, toolBarBitmaps[10], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Actual Size")); currentX += width + 5; - toolBar->AddTool(ID_ZOOMWIDTH, toolBarBitmaps[9], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Fit Width"); + toolBar->AddTool(ID_ZOOMWIDTH, toolBarBitmaps[9], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Fit Width")); currentX += width + 5; - toolBar->AddTool(ID_ZOOMHEIGHT, toolBarBitmaps[8], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Fit In Window"); + toolBar->AddTool(ID_ZOOMHEIGHT, toolBarBitmaps[8], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Fit In Window")); currentX += width + 5; /* toolBar->AddTool(ID_ZOOMIN, toolBarBitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Zoom +"); @@ -309,7 +316,8 @@ currentX += width + 5; */ toolBar->AddSeparator(); - toolBar->AddTool(ID_ABOUT, toolBarBitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open About Dialog"); + toolBar->AddTool(ID_ABOUT, toolBarBitmaps[3], wxNullBitmap, FALSE, + currentX, -1, (wxObject *) NULL, wxT("Open About Dialog")); toolBar->Realize(); --- sffview-0.3.orig/sffdoc.cpp +++ sffview-0.3/sffdoc.cpp @@ -129,7 +129,8 @@ try { wxBusyCursor wait; m_nPageIdx = 0; - m_pSffFile = new CSffFile(filename.c_str()); + std::string strFN(filename.fn_str()); + m_pSffFile = new CSffFile(strFN); m_pDecoder = new CBitmapDecoder(GetWidth(), GetHeight()); SetFilename(filename, TRUE); Modify(FALSE); @@ -137,7 +138,7 @@ rc = true; } catch (CSimpleException e) { - wxLogError( e.what().c_str() ); + wxLogError( (wxChar *) e.what().c_str() ); } return rc; } @@ -212,7 +213,7 @@ } } catch (CSimpleException e) { - wxLogError( e.what().c_str() ); + wxLogError( (wxChar *)e.what().c_str() ); } } ++++++ sffview-0.3.diff ++++++ --- /var/tmp/diff_new_pack.PntTsa/_old 2006-10-16 10:59:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PntTsa/_new 2006-10-16 10:59:45.000000000 +0200 @@ -7,12 +7,12 @@ -WXCONFIG_CPP = `wxgtk2-2.5-config --cflags` -#WXCONFIG_CPP = `wx-config --cflags` +#WXCONFIG_CPP = `wxgtk2-2.5-config --cflags` -+WXCONFIG_CPP = `wx-config --unicode=no --cflags` ++WXCONFIG_CPP = `wx-config --unicode=yes --cflags` -WXCONFIG_LD = `wxgtk2-2.5-config --libs` -#WXCONFIG_LD = `wx-config --libs` +#WXCONFIG_LD = `wxgtk2-2.5-config --libs` -+WXCONFIG_LD = `wx-config --unicode=no --libs` ++WXCONFIG_LD = `wx-config --unicode=yes --libs` # implementation @@ -20,7 +20,7 @@ .cpp.o : - $(CC) -g -march=athlon -mcpu=athlon-xp -c $(WXCONFIG_CPP) -o $@ $< -+ $(CC) -g -c $(WXCONFIG_CPP) -o $@ $< ++ $(CC) -g $(RPM_OPT_FLAGS) -c $(WXCONFIG_CPP) -o $@ $< all: $(PROGRAM) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org