[Frugalware-darcs] frugalware-current: cups-1.2.11-3-i686

voroskoi voroskoi at frugalware.org
Tue Jun 26 19:48:09 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070626172828-dd049-2ff842b0e7a46f328881135d701719e2e35dfd39.gz;

[cups-1.2.11-3-i686
voroskoi <voroskoi at frugalware.org>**20070626172828
 added patch to fix #2052
] {
hunk ./source/apps/cups/FrugalBuild 7
-pkgrel=2
+pkgrel=3
hunk ./source/apps/cups/FrugalBuild 17
-	rc.cups rc.cups-{hu,de}.po)
+	rc.cups rc.cups-{hu,de}.po str2408.patch)
hunk ./source/apps/cups/FrugalBuild 26
+	Fpatchall
hunk ./source/apps/cups/FrugalBuild 55
-          '03197abb98eff18d3ede3000a61c7783b8c1ad92')
+          '03197abb98eff18d3ede3000a61c7783b8c1ad92'\
+          '1f6f12423c3e5c81fdead20ecfa4c7bd9f7367ec')
addfile ./source/apps/cups/str2408.patch
hunk ./source/apps/cups/str2408.patch 1
+Index: ppd.c
+===================================================================
+--- cups/ppd.c	(revision 6579)
++++ cups/ppd.c	(working copy)
+@@ -1022,11 +1022,15 @@
+ 
+       if ((option = ppdFindOption(ppd, keyword + 6)) == NULL)
+       {
++        int		groupidx;	/* Index for current group */
+ 	ppd_group_t	*gtemp;		/* Temporary group */
+ 
+ 
+         DEBUG_printf(("%s option not found for %s...\n", keyword + 6, keyword));
+ 
++        if (group)
++          groupidx = group - ppd->groups; /* Save index for current group */
++
+ 	if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
+ 	                           encoding)) == NULL)
+ 	{
+@@ -1035,6 +1039,9 @@
+ 	  goto error;
+ 	}
+ 
++        if (group)
++          group = ppd->groups + groupidx; /* Restore group pointer */
++
+ 	if ((option = ppd_get_option(gtemp, keyword + 6)) == NULL)
+ 	{
+ 	  DEBUG_printf(("Unable to get %s option!\n", keyword + 6));
+@@ -1088,8 +1095,12 @@
+ 
+ 	if ((option = ppdFindOption(ppd, "PageRegion")) == NULL)
+ 	{
++	  int		groupidx;	/* Index to current group */
+ 	  ppd_group_t	*gtemp;		/* Temporary group */
+ 
++          if (group)
++            groupidx = group - ppd->groups; /* Save index for current group */
++
+ 	  if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
+ 				     encoding)) == NULL)
+ 	  {
+@@ -1098,6 +1109,9 @@
+ 	    goto error;
+ 	  }
+ 
++          if (group)
++            group = ppd->groups + groupidx; /* Restore group pointer */
++
+ 	  option = ppd_get_option(gtemp, "PageRegion");
+         }
+ 
}


More information about the Frugalware-darcs mailing list