Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13350
Modified Files: xcdroast.info xcdroast.patch Log Message: new version, upgraded to gtk2 Index: xcdroast.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/xcdroast.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xcdroast.patch 20 Jan 2006 20:32:32 -0000 1.1 +++ xcdroast.patch 5 Apr 2009 10:01:44 -0000 1.2 @@ -1,51 +1,24 @@ ---- xcdroast-0.98alpha14/src/io.c 2003-05-29 23:14:42.000000000 +1000 -+++ xcdroast-0.98alpha14-patched/src/io.c 2003-08-10 11:35:54.000000000 +1000 -@@ -5507,7 +5507,11 @@ - } +diff -Nurd -x'*~' xcdroast-0.98alpha16.orig/src/Makefile.in xcdroast-0.98alpha16/src/Makefile.in +--- xcdroast-0.98alpha16.orig/src/Makefile.in 2008-08-21 05:43:28.000000000 -0400 ++++ xcdroast-0.98alpha16/src/Makefile.in 2009-04-05 04:38:09.000000000 -0400 +@@ -112,7 +112,7 @@ + install_sh = @install_sh@ - /* build command line */ -- get_wrap_path_cdrecord(tmp3); -+ if (curset.isProDVD) { -+ get_wrap_path("CDRECORDPRODVD", tmp3); -+ } else { -+ get_wrap_path("CDRECORD", tmp3); -+ } - g_snprintf(line,MAXLINE,"%s %s -atip 2>&1", - tmp3,tmp); + localedir = $(datadir)/locale +-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" $(GTK_CFLAGS) ++INCLUDES = -DLOCALEDIR=\"$(localedir)\" $(GTK_CFLAGS) -@@ -5517,6 +5521,11 @@ - if ((fpin = popen(line,"r")) == NULL) { - g_error("popen error\n"); - } -+ -+ /* syntax for dvd-atip is different */ -+ if (is_dvdwriter(curset.writer_devnr)) { -+ found_atip = 1; -+ } + bin_PROGRAMS = xcdroast + pkgbin_PROGRAMS = wavplay rmtool vrfytool cddbtool xcdrwrap +diff -Nurd -x'*~' xcdroast-0.98alpha16.orig/src/main.c xcdroast-0.98alpha16/src/main.c +--- xcdroast-0.98alpha16.orig/src/main.c 2008-08-21 05:45:34.000000000 -0400 ++++ xcdroast-0.98alpha16/src/main.c 2009-04-05 04:54:46.000000000 -0400 +@@ -373,7 +373,7 @@ + #if (defined(__MACH__) && defined(__APPLE__)) + /* dont use xshm on darwin -> its broken */ + /* from gdk-private */ +- gdk_use_xshm = FALSE; ++ gdk_set_use_xshm(TRUE); + #endif - errcount = 0; - for (;;) { -@@ -6605,7 +6614,7 @@ - read_output_ctrl = 4; - } - /* check Medium error/buffer underrun */ -- if (strncmp(tmp2,"Input/output error",18)) { -+ if (strncmp(tmp2,"Input/output error",18) == 0) { - read_output_ctrl = 5; - } - } -@@ -9879,9 +9888,12 @@ - if (strcmp(ver,"") == 0) { - p = strstr(vline,"Cdrecord"); - if (p != NULL) { -- p = strtok(p+9, " "); -+ p = strtok(p+7, " "); - if (p != NULL) { -- strcpy(ver,p); -+ p = strtok(NULL, " "); -+ if (p) { -+ strcpy(ver,p); -+ } - } - } - } + /* get rid of badmatch() errors */ Index: xcdroast.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/xcdroast.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- xcdroast.info 19 Mar 2009 05:01:58 -0000 1.6 +++ xcdroast.info 5 Apr 2009 10:01:43 -0000 1.7 @@ -1,40 +1,64 @@ Package: xcdroast -Version: 0.98alpha14 -Revision: 27 +Version: 0.98alpha16 +Revision: 1 Distribution: 10.4, 10.5 Maintainer: None <fink-de...@lists.sourceforge.net> -Depends: cdrtools (>= 2.0.1-1), gdk-pixbuf-shlibs, libgettext3-shlibs -BuildDepends: gtk+, glib, gdk-pixbuf, orbit-dev, imlib, esound, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, fink (>= 0.24.12-1) +Depends: << + atk1-shlibs (>= 1.24.0-1), + cairo-shlibs (>= 1.8-1), + cdda2wav (>= 2.01.01-10.4.47), + cdrecord (>= 2.01.01-10.4.47), + freetype219-shlibs (>= 2.3.7-7), + glib2-shlibs (>= 2.18.0-1), + gtk+2-shlibs (>= 2.14.0-1), + libgettext3-shlibs, + libiconv, + mkisofs (>= 2.01.01-10.4.47), + pango1-xft2-ft219-shlibs (>= 1.22.4-1), + x11 +<< +BuildDepends: << + atk1 (>= 1.24.0-1), + cairo (>= 1.8-1), + fink (>= 0.24.12-1), + freetype219 (>= 2.3.7-7), + glib2-dev (>= 2.18.0-1), + gtk+2-dev (>= 2.14.0-1), + libgettext3-dev, + libiconv-dev, + libpng3, + pango1-xft2-ft219-dev (>= 1.22.4-1), + pixman (>= 0.12.0-1), + pkgconfig (>= 0.23), + x11-dev +<< Source: mirror:sourceforge:%n/%n-%v.tar.gz -Source-MD5: c5f3f1ab6ff6d286bd984def54ef0c54 +Source-MD5: bc3d335a30f292067eaaf1ea03ebaf17 PatchFile: %n.patch -PatchFile-MD5: 04b9759d1c109a80fe96bea4c76f995d +PatchFile-MD5: 3878edf6f6347e7e52a2193b029da5df PatchScript: << %{default_script} - # fix for gcc 3.3 + # fix for gcc 3.3 and beyond perl -pi.bak -e 's,-traditional-cpp,,g' configure << -ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --enable-gtk2 InstallScript: << mkdir -p %i/share/doc/xcdroast make install DESTDIR=%d cp -r doc %i/share/doc/xcdroast - rm -f %i/share/locale/locale.alias %i/lib/locale.alias %i/lib/charset.alias << -DocFiles: AUTHORS ChangeLog COPYING README +DocFiles: ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README Description: Frontend for cdrtools DescUsage: << For more info on using xcdroast under MacOSX please refer to the document -'README.MacOSX' installed in your finkdirectory/share/doc/xcdroast. -<< -DescPort: << - Included some upstream patches that fix some issues found since the -release of xcdroast-0.98alpha14, for more details see http://xcdroast.org. + %p/share/share/doc/xcdroast/README.MacOSX << DescPackaging: << Originally packaged by Matt Stephenson. -Do not install charset.alias files. + Don't force internal gettext + + Use gdk accessor instead of direct variable assignment << License: GPL Homepage: http://xcdroast.org ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs