Attachment 1751 Details for Bug 947 – Patch to fix first patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to fix first patch

kbarcode-unknown-icon-type.diff (text/plain), 6.49 KB, created by Darrell on 2013-12-27 16:12:26 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2013-12-27 16:12:26 CST

Size: 6.49 KB

patch

obsolete

>diff -urNa kbarcode/kbarcode/Makefile.am kbarcode.new/kbarcode/Makefile.am
>--- kbarcode/kbarcode/Makefile.am	2013-12-23 15:41:54.000000000 -0600
>+++ kbarcode.new/kbarcode/Makefile.am	2013-12-27 14:39:09.141948055 -0600
>@@ -1,5 +1,7 @@
> ## Makefile.am for kbarcode
> 
>+SUBDIRS = pics
>+
> # set the include path for X, qt and KDE
> INCLUDES = -I$(top_srcdir)/src $(all_includes)
> 
>@@ -8,7 +10,7 @@
> 
> # let automoc handle all of the meta source files (moc)
> METASOURCES = AUTO
>-KDE_ICON = kbarcode
>+KDE_ICON = AUTO
> 
> messages: rc.cpp
> 	$(XGETTEXT) *.cpp -o $(podir)/kdedcoptest.pot
>@@ -54,5 +56,5 @@
> 
> xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-label.desktop kbarcode-single.desktop
> 
>-datafiles_DATA = logo.png barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
>+datafiles_DATA = barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
> datafilesdir = $(kde_datadir)/kbarcode
>diff -urNa kbarcode/kbarcode/logo.png kbarcode.new/kbarcode/logo.png
>--- kbarcode/kbarcode/logo.png	2012-09-14 17:40:10.000000000 -0500
>+++ kbarcode.new/kbarcode/logo.png	1969-12-31 19:00:00.000000000 -0500
>@@ -1,18 +0,0 @@
>-PNG
>-
>-
IHDRÞB8Ãh	pHYsÒÝ~ütIMEÒ6ûYkLïIDATxÚíOÜTÇ3;Iff·»ÝZì¶V*REPµÐC·<ÚEµ^QúÇöÒõT¥¶EªQB)hPZðbAPiÑv§¢ÝÝÙÙùÌf<ì¼éKæ½äåå½Ì¤óûBØI&É$/ïïï÷{ÙL«Õj
>-JTYl
>-ÁC¡<
>-à¡P
>-BðP(B!x(B¡<ª'Ê%ùa\ðÌæz¯=:¢äóî»g"ðý«×K}µ_:õû5ÒÞôù6dY.p£¦×x?ø¥
>-/>\ÄBÇ¢íßÏÂZ+nã|]©u^?³©W9(t¼ÐrÔÌÂ¨áB!
>-ç®¶n	t´Æ,þ=`¾ávàCçC¡ã@Çr;?tcVÆ¬,CîDÖAçC!x6ùÏ3ïÏíxÕK9V;CÏú
>-Ák«d»¡ë°BL]hø0çC!xÛM´Ým%¶K^ÒÐÊgº&?|t.HP¨´)VqeÃ7ÿÂ×f®0|´Vå30b°CÒ[uüY§UÃ|N8pG/W<é¢ãIÖ>EöãßÞ&êq®O¯÷eÚ8ÉöÛ'T|4x´ÛMPC¼Â
>-ßùÃLâvÃFV|×[iea®áÂùÛÞþÇMUu
>-²<h¬íÈ2]9Áu=í¢£lûöâXçx7®ÂÊL{ÌmÖ&×)Û.Û¯ç.ØK-k¯{«ÞÓE§öíiÑY^NBÍ¹övd\¯l· l»pôr¥¯\;ìâu¿ß¡íøi8V¥àÿÃ}O&¿£µØP$ÌL¢ó%å2: JÎ$¶ÓÕNI£ò88^T×óOXX,èÒp#Rq¬Ê+%Ûõäz<íÜ»bæÛ¹Ú\ÃíäzAùÃÌ4»êÎ¸¹Ä2ÇÎíäxDt®à²íöå¼z½©Ê'ráE÷,SíE;ý©n{-%A^Å/ 7èxnÇÛÜï}$á¼¼Î¥«£õUÊê³îýH7.¬³²p³Ù5¹Lh¨9k·`ÜÌ´]êöÐIäÛ	,·]òÐÉvÞAÅuõíè³¶ÛõÕ ?|d\NDIÛ¡Rã?Üäd\¯l·à¯%Aà¼Ðé1Ñ	Q}Þ6\d =,×cÃçúÀâM.ºYIDgCõJÊCM^®Gò8YÐÑïr³ÂÎ¸
¡tã9Oßèz¼ÓIÔP1)èú5dM:-ùË>j¶ö!çÊ¢(#û¯éÇÆÖQIÖÓDôãdã¦|;ëûÌãRõd¾HçSu£|ë@¸ßº=.¡ðûµí£:£tïg¹í|%Ûõ8ßZ+Ûå~QË¿ìwÿP¨TWX^ÞG óW;	L"«p3ÓÐnzS6Ç%;öâXÚ/ßó3
·3Ek;^Ù¯÷ý\¤H¾ ítµSÒí<:ÜdÁÇ;y0Mi)]DÞû²ÛÝIð¬¯«dUö³b;^|,÷+)ªDlWÛ%
L§é¤eCd»¨ûmß^+KÒUM¿X_eU;iMHT6K¶?m¿³sTª¥<øxFHðè°+ËÁ×þ ~à¶nÙVÿ¿~¸pläóyþ
Ã0ºårÝõ
åà¯¾<ÆÝÏ=øþÇ|Ê\>==í?uêìyù%Ïòï½öïë,;vüDg>Ç8£o½Í=¦7ßxÝ3èð®e´,Ób.õàÁÎëãï£ÚmöìÝ'ß=ÑY¶gï¾ÀvúèÃåóoÁr1îëñüî¸Ûyú´gþ©]»<ïéyÇ'=óçÏ<¾|>SSÛàÒ¥eSSÛËñ6nXó¼Ï?ä@
>-0"
>-«×ëpö»sà¾=sVÙU«&ÿc»4tA ùuèð¨TÂ0Kû_9 ì¼tA ùE&£jµ
>-UÎ5Ìçó¾$+eÃ	~øÂ¼!X¥¼¶s5\Û¹:pF]ìçÜý®ç8ÓíT¨PÔûO5ÇéZÖl/k2ÞÓÈÈH(|
»Á|[¶ÓLü&V,¡È¹õz=0J<?|aú!dM~à¶nÙÌ¾çÃÿuÿEs$:©NYÜsë´Ûå$o&###ÂÅýT¸]/¤ÓñbU³ÙìÊ6nXiÂßÿd¬<(¶¨b¹.ÕªUiÇkÞÝýNÝTp>JeZº\/Ý@§ÓñbÇ*B¦	mÃ¦îï,#AFkrrr9d3²Ps\(ÙÀPSÔõè3CqÃL®§::´LÊézízÅb__8÷lz«FB@Gz°óúç_ÉÉIpíCÍqà.é/D\uìMÇaHçxÀ°<¸_RÚN³gð¥"Çët
>-ÛZÈµk5°¸¸¸¶QðÅ)¬$ãõº¢)ã|¸ ×¤/5UÍ ·t@f¡ãxAÀ©p;]
5£ªs<ÂÊ åx©ªj¹^¡	q¼ãk×<®ãÅq½4:s¼ PsÐr¼j@ÔÒ·Çs½Z-âx#Y³àÉñt¸.øâ"Î§cOÄù0Ç/õ9^ãÅÉñõZ×ò¤ÇñâT6eOÅ8^XaeÐr<^¨9ÇíXËÌñt:®/l8!éJf?äxA)æx×Íù¢jiI¼ÔªU¨,Sã¼ù4»Ý°Ïñ~-BõØñP(B!x(B¡<
>-ÁC¡P
>-à¡P(iýù6åIEND®B`
>\ No newline at end of file
>diff -urNa kbarcode/kbarcode/pics/Makefile.am kbarcode.new/kbarcode/pics/Makefile.am
>--- kbarcode/kbarcode/pics/Makefile.am	1969-12-31 19:00:00.000000000 -0500
>+++ kbarcode.new/kbarcode/pics/Makefile.am	2013-12-27 14:49:20.409491086 -0600
>@@ -0,0 +1,2 @@
>+kbarcodepicsdir = $(kde_datadir)/kbarcode
>+kbarcodepics_DATA = logo.png
>\ No newline at end of file
>diff -urNa kbarcode/kbarcode/pics/logo.png kbarcode.new/kbarcode/pics/logo.png
>--- kbarcode/kbarcode/pics/logo.png	1969-12-31 19:00:00.000000000 -0500
>+++ kbarcode.new/kbarcode/pics/logo.png	2012-09-14 17:40:10.000000000 -0500
>@@ -0,0 +1,18 @@
>+PNG
>+
>+
IHDRÞB8Ãh	pHYsÒÝ~ütIMEÒ6ûYkLïIDATxÚíOÜTÇ3;Iff·»ÝZì¶V*REPµÐC·<ÚEµ^QúÇöÒõT¥¶EªQB)hPZðbAPiÑv§¢ÝÝÙÙùÌf<ì¼éKæ½äåå½Ì¤óûBØI&É$/ïïï÷{ÙL«Õj
>+JTYl
>+ÁC¡<
>+à¡P
>+BðP(B!x(B¡<ª'Ê%ùa\ðÌæz¯=:¢äóî»g"ðý«×K}µ_:õû5ÒÞôù6dY.p£¦×x?ø¥
>+/>\ÄBÇ¢íßÏÂZ+nã|]©u^?³©W9(t¼ÐrÔÌÂ¨áB!
>+ç®¶n	t´Æ,þ=`¾ávàCçC¡ã@Çr;?tcVÆ¬,CîDÖAçC!x6ùÏ3ïÏíxÕK9V;CÏú
>+Ák«d»¡ë°BL]hø0çC!xÛM´Ým%¶K^ÒÐÊgº&?|t.HP¨´)VqeÃ7ÿÂ×f®0|´Vå30b°CÒ[uüY§UÃ|N8pG/W<é¢ãIÖ>EöãßÞ&êq®O¯÷eÚ8ÉöÛ'T|4x´ÛMPC¼Â
>+ßùÃLâvÃFV|×[iea®áÂùÛÞþÇMUu
>+²<h¬íÈ2]9Áu=í¢£lûöâXçx7®ÂÊL{ÌmÖ&×)Û.Û¯ç.ØK-k¯{«ÞÓE§öíiÑY^NBÍ¹övd\¯l· l»pôr¥¯\;ìâu¿ß¡íøi8V¥àÿÃ}O&¿£µØP$ÌL¢ó%å2: JÎ$¶ÓÕNI£ò88^T×óOXX,èÒp#Rq¬Ê+%Ûõäz<íÜ»bæÛ¹Ú\ÃíäzAùÃÌ4»êÎ¸¹Ä2ÇÎíäxDt®à²íöå¼z½©Ê'ráE÷,SíE;ý©n{-%A^Å/ 7èxnÇÛÜï}$á¼¼Î¥«£õUÊê³îýH7.¬³²p³Ù5¹Lh¨9k·`ÜÌ´]êöÐIäÛ	,·]òÐÉvÞAÅuõíè³¶ÛõÕ ?|d\NDIÛ¡Rã?Üäd\¯l·à¯%Aà¼Ðé1Ñ	Q}Þ6\d =,×cÃçúÀâM.ºYIDgCõJÊCM^®Gò8YÐÑïr³ÂÎ¸
¡tã9Oßèz¼ÓIÔP1)èú5dM:-ùË>j¶ö!çÊ¢(#û¯éÇÆÖQIÖÓDôãdã¦|;ëûÌãRõd¾HçSu£|ë@¸ßº=.¡ðûµí£:£tïg¹í|%Ûõ8ßZ+Ûå~QË¿ìwÿP¨TWX^ÞG óW;	L"«p3ÓÐnzS6Ç%;öâXÚ/ßó3
·3Ek;^Ù¯÷ý\¤H¾ ítµSÒí<:ÜdÁÇ;y0Mi)]DÞû²ÛÝIð¬¯«dUö³b;^|,÷+)ªDlWÛ%
L§é¤eCd»¨ûmß^+KÒUM¿X_eU;iMHT6K¶?m¿³sTª¥<øxFHðè°+ËÁ×þ ~à¶nÙVÿ¿~¸pläóyþ
Ã0ºårÝõ
åà¯¾<ÆÝÏ=øþÇ|Ê\>==í?uêìyù%Ïòï½öïë,;vüDg>Ç8£o½Í=¦7ßxÝ3èð®e´,Ób.õàÁÎëãï£ÚmöìÝ'ß=ÑY¶gï¾ÀvúèÃåóoÁr1îëñüî¸Ûyú´gþ©]»<ïéyÇ'=óçÏ<¾|>SSÛàÒ¥eSSÛËñ6nXó¼Ï?ä@
>+0"
>+«×ëpö»sà¾=sVÙU«&ÿc»4tA ùuèð¨TÂ0Kû_9 ì¼tA ùE&£jµ
>+UÎ5Ìçó¾$+eÃ	~øÂ¼!X¥¼¶s5\Û¹:pF]ìçÜý®ç8ÓíT¨PÔûO5ÇéZÖl/k2ÞÓÈÈH(|
»Á|[¶ÓLü&V,¡È¹õz=0J<?|aú!dM~à¶nÙÌ¾çÃÿuÿEs$:©NYÜsë´Ûå$o&###ÂÅýT¸]/¤ÓñbU³ÙìÊ6nXiÂßÿd¬<(¶¨b¹.ÕªUiÇkÞÝýNÝTp>JeZº\/Ý@§ÓñbÇ*B¦	mÃ¦îï,#AFkrrr9d3²Ps\(ÙÀPSÔõè3CqÃL®§::´LÊézízÅb__8÷lz«FB@Gz°óúç_ÉÉIpíCÍqà.é/D\uìMÇaHçxÀ°<¸_RÚN³gð¥"Çët
>+ÛZÈµk5°¸¸¸¶QðÅ)¬$ãõº¢)ã|¸ ×¤/5UÍ ·t@f¡ãxAÀ©p;]
5£ªs<ÂÊ åx©ªj¹^¡	q¼ãk×<®ãÅq½4:s¼ PsÐr¼j@ÔÒ·Çs½Z-âx#Y³àÉñt¸.øâ"Î§cOÄù0Ç/õ9^ãÅÉñõZ×ò¤ÇñâT6eOÅ8^XaeÐr<^¨9ÇíXËÌñt:®/l8!éJf?äxA)æx×Íù¢jiI¼ÔªU¨,Sã¼ù4»Ý°Ïñ~-BõØñP(B!x(B¡<
>+ÁC¡P
>+à¡P(iýù6åIEND®B`
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 947: 1690 | 1751