From ccc9cd1a32a3476c209b59b7c7f08c3ad6fd1b70 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 16 May 2021 17:50:38 +0200 Subject: [PATCH 1/3] debian: drop old Debian menu file Debian officially deprecated the old Debian menu system more than 5 years ago [1]. Hence, drop the old menu file, as not much of use anymore. [1] https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html --- packaging/obs_debian/debian.menu | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 packaging/obs_debian/debian.menu diff --git a/packaging/obs_debian/debian.menu b/packaging/obs_debian/debian.menu deleted file mode 100644 index 82c8923..0000000 --- a/packaging/obs_debian/debian.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(gsmartcontrol):needs="X11" section="Applications/System/Hardware"\ - title="GSmartControl" command="/usr/bin/gsmartcontrol-root"\ - longtitle="Hard Disk and SSD Health Inspection"\ - icon="/usr/share/pixmaps/gsmartcontrol.xpm" From b53bbe5a971bc894ccbf0713454b0f22c2c0ec6a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 16 May 2021 17:54:01 +0200 Subject: [PATCH 2/3] Drop the XPM version of the app icon The application icon is already provided as PNG in different sizes, and installed in the global XDG hicolor icon theme. Hence, the XPM version of it can be dropped, as it is redundant. --- data/CMakeLists.txt | 3 +- data/gsmartcontrol.xpm | 394 --------------------------- packaging/obs_rpm/gsmartcontrol.spec | 1 - 3 files changed, 1 insertion(+), 397 deletions(-) delete mode 100644 data/gsmartcontrol.xpm diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 391d8ea..44d72df 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -39,8 +39,7 @@ endif() if (NOT WIN32) # Application pixmap (fallback icon for desktop files). # Same as 48/gsmartcontrol.png. - # Also, xpm for debian menu, 32x32. - install(FILES 48/gsmartcontrol.png gsmartcontrol.xpm + install(FILES 48/gsmartcontrol.png DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps/") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.desktop" diff --git a/data/gsmartcontrol.xpm b/data/gsmartcontrol.xpm deleted file mode 100644 index 6fb178b..0000000 --- a/data/gsmartcontrol.xpm +++ /dev/null @@ -1,394 +0,0 @@ -/* XPM */ -static char * gsmartcontrol_xpm[] = { -"32 32 359 2", -" c None", -". c #ABAAAA", -"+ c #CCCCCC", -"@ c #C5C4C4", -"# c #C2C1C1", -"$ c #D2D1D1", -"% c #C8C7C7", -"& c #C8C7C8", -"* c #C9C8C8", -"= c #CAC8C9", -"- c #CAC9C9", -"; c #C8C6C7", -"> c #C7C6C6", -", c #CFCDCE", -"' c #D1D0D0", -") c #C6C5C6", -"! c #CFCECE", -"~ c #B9B7B7", -"{ c #D4D4D4", -"] c #DCDBDC", -"^ c #D8D7D7", -"/ c #D6D5D5", -"( c #D6D5D6", -"_ c #D7D6D6", -": c #D9D8D8", -"< c #DBDADB", -"[ c #DAD9DA", -"} c #D7D7D7", -"| c #D6D6D6", -"1 c #DAD9D9", -"2 c #E2E1E1", -"3 c #B0AFAF", -"4 c #D3D2D2", -"5 c #CDCCCC", -"6 c #CDCDCD", -"7 c #CECDCD", -"8 c #CECECE", -"9 c #CFCFCF", -"0 c #D0CFCF", -"a c #C0BFBF", -"b c #9C9A9B", -"c c #6E6B6B", -"d c #807E7F", -"e c #C8C8C8", -"f c #CAC9CA", -"g c #CACACA", -"h c #CBCACA", -"i c #CCCBCB", -"j c #CCCBCC", -"k c #D0CECF", -"l c #C3C2C2", -"m c #A09E9F", -"n c #B5B4B4", -"o c #AFADAE", -"p c #787576", -"q c #8D8B8B", -"r c #D4D3D3", -"s c #C7C6C7", -"t c #C7C7C7", -"u c #C9C8C9", -"v c #C9C9C9", -"w c #CACAC9", -"x c #BFBEBE", -"y c #A3A1A2", -"z c #A09D9E", -"A c #B4B2B2", -"B c #B6B4B4", -"C c #827F80", -"D c #969595", -"E c #C4C3C3", -"F c #C4C4C4", -"G c #C5C5C5", -"H c #C6C5C5", -"I c #C6C6C6", -"J c #C9C7C8", -"K c #B9B7B8", -"L c #A5A4A4", -"M c #A4A3A3", -"N c #A7A5A5", -"O c #B3B1B2", -"P c #BFBDBD", -"Q c #8D8A8B", -"R c #A09F9F", -"S c #DDDCDC", -"T c #C0C0C0", -"U c #C3C1C2", -"V c #C3C2C3", -"W c #C3C3C3", -"X c #C4C3C4", -"Y c #B2B1B1", -"Z c #A8A7A7", -"` c #ABA9A9", -" . c #CFCECF", -".. c #C2C0C1", -"+. c #989697", -"@. c #A8A6A7", -"#. c #DEDDDD", -"$. c #DEDDDE", -"%. c #C1C0C0", -"&. c #C2C1C2", -"*. c #B1B0B0", -"=. c #ADACAC", -"-. c #AFAEAE", -";. c #BDBCBC", -">. c #B3B2B2", -",. c #B4B3B4", -"'. c #B8B8B8", -"). c #D5D4D4", -"!. c #C0BFBE", -"~. c #C1C0C1", -"{. c #C3C1C1", -"]. c #C4C4C3", -"^. c #B2B0B1", -"/. c #B3B2B3", -"(. c #B4B3B3", -"_. c #A1A0A0", -":. c #B9B8B8", -"<. c #C4C2C3", -"[. c #BDBBBC", -"}. c #B5B4B3", -"|. c #B6B4B5", -"1. c #B7B5B6", -"2. c #B7B6B7", -"3. c #B8B7B7", -"4. c #B8B7B8", -"5. c #BCBABB", -"6. c #BBBABA", -"7. c #BFBEBF", -"8. c #C1C1C1", -"9. c #C1BFC0", -"0. c #BCBBBB", -"a. c #BEBCBD", -"b. c #BEBDBD", -"c. c #9B999A", -"d. c #9D9B9B", -"e. c #C2C2C2", -"f. c #D4D3D4", -"g. c #CECDCE", -"h. c #C7C5C5", -"i. c #A4A2A3", -"j. c #A19F9F", -"k. c #C6C4C5", -"l. c #DCDCDC", -"m. c #D0CFD0", -"n. c #CECCCD", -"o. c #A2A1A1", -"p. c #939292", -"q. c #E1E0E0", -"r. c #E3E3E3", -"s. c #B3B3B3", -"t. c #CCCACB", -"u. c #D2D2D2", -"v. c #D5D3D4", -"w. c #A7A6A6", -"x. c #959494", -"y. c #E3E2E2", -"z. c #DCDBDB", -"A. c #CBC9CA", -"B. c #E1E0E1", -"C. c #DFDEDE", -"D. c #CECCCC", -"E. c #CDCCCD", -"F. c #D2D0D0", -"G. c #D2D0D1", -"H. c #B5B4B5", -"I. c #B1AFB0", -"J. c #EDECEC", -"K. c #D1CFCF", -"L. c #CDCBCC", -"M. c #D5D5D5", -"N. c #DCDADA", -"O. c #C5C4C5", -"P. c #D2D1D2", -"Q. c #D5D4D5", -"R. c #DADADA", -"S. c #DBDADA", -"T. c #DDDCDD", -"U. c #D7D6D7", -"V. c #E8E7E7", -"W. c #D8D8D8", -"X. c #D8D6D6", -"Y. c #D9D8D9", -"Z. c #DBDBDB", -"`. c #DDDDDD", -" + c #474747", -".+ c #ECEBEB", -"++ c #F3F3F3", -"@+ c #E4E3E3", -"#+ c #E0DFDF", -"$+ c #E5E5E5", -"%+ c #EFEFEF", -"&+ c #EBEAEB", -"*+ c #E6E5E5", -"=+ c #E0E0E0", -"-+ c #E4E4E4", -";+ c #E5E4E4", -">+ c #ECECEC", -",+ c #666666", -"'+ c #585757", -")+ c #D9D9DA", -"!+ c #E2E2E2", -"~+ c #E6E5E6", -"{+ c #E1E1E1", -"]+ c #E6E6E6", -"^+ c #E7E7E7", -"/+ c #898989", -"(+ c #767575", -"_+ c #E0DFE0", -":+ c #E9E9E9", -"<+ c #BDBDBD", -"[+ c #B6B6B6", -"}+ c #B0B0B0", -"|+ c #ACACAC", -"1+ c #ACABAC", -"2+ c #A7A7A7", -"3+ c #DFDFDF", -"4+ c #E5E5E4", -"5+ c #E9E8E8", -"6+ c #E8E8E8", -"7+ c #E3E2E3", -"8+ c #D7D5D5", -"9+ c #8E8D8D", -"0+ c #807F7F", -"a+ c #494848", -"b+ c #5A5758", -"c+ c #605E5F", -"d+ c #646262", -"e+ c #555354", -"f+ c #1F1F1F", -"g+ c #282626", -"h+ c #323031", -"i+ c #3D3C3C", -"j+ c #494748", -"k+ c #555353", -"l+ c #5A5959", -"m+ c #3E3D3D", -"n+ c #434242", -"o+ c #444343", -"p+ c #414041", -"q+ c #3E3E3E", -"r+ c #4A4949", -"s+ c #706D6E", -"t+ c #6B6969", -"u+ c #6A6869", -"v+ c #696469", -"w+ c #656065", -"x+ c #595757", -"y+ c #A5A5A5", -"z+ c #767676", -"A+ c #8A8888", -"B+ c #4B4849", -"C+ c #5C5A5A", -"D+ c #686565", -"E+ c #524F50", -"F+ c #000000", -"G+ c #090607", -"H+ c #171415", -"I+ c #262324", -"J+ c #363334", -"K+ c #454343", -"L+ c #4A4748", -"M+ c #212020", -"N+ c #2A292A", -"O+ c #2C2B2B", -"P+ c #272626", -"Q+ c #242424", -"R+ c #242323", -"S+ c #3C3B3B", -"T+ c #726F70", -"U+ c #6C696A", -"V+ c #6B676A", -"W+ c #7A916C", -"X+ c #7B926B", -"Y+ c #605F60", -"Z+ c #9C9B9C", -"`+ c #606060", -" @ c #8F8D8D", -".@ c #494747", -"+@ c #595657", -"@@ c #615E5F", -"#@ c #656162", -"$@ c #525050", -"%@ c #020101", -"&@ c #0C0A0A", -"*@ c #1A1818", -"=@ c #282525", -"-@ c #454243", -";@ c #494647", -">@ c #2A2929", -",@ c #393838", -"'@ c #363536", -")@ c #323131", -"!@ c #2B292A", -"~@ c #282727", -"{@ c #444243", -"]@ c #696666", -"^@ c #666268", -"/@ c #709D48", -"(@ c #7BAD4A", -"_@ c #68686A", -":@ c #8F8E8F", -"<@ c #4E4D4E", -"[@ c #8E8C8D", -"}@ c #484546", -"|@ c #555253", -"1@ c #5D595A", -"2@ c #5F5B5C", -"3@ c #514F50", -"4@ c #0F0D0D", -"5@ c #211E1F", -"6@ c #312E2F", -"7@ c #413D3E", -"8@ c #222121", -"9@ c #2E2D2D", -"0@ c #312F30", -"a@ c #262425", -"b@ c #464344", -"c@ c #696667", -"d@ c #666263", -"e@ c #5F5E5F", -"f@ c #5A5B5B", -"g@ c #797577", -"h@ c #7A7A7A", -"i@ c #4C4A4A", -"j@ c #2A2728", -"k@ c #2C292A", -"l@ c #302D2E", -"m@ c #312F2F", -"n@ c #2E2C2C", -"o@ c #100F0F", -"p@ c #110F10", -"q@ c #141212", -"r@ c #1B1919", -"s@ c #242222", -"t@ c #2D2B2B", -"u@ c #322F30", -"v@ c #2F2D2D", -"w@ c #2B2829", -"x@ c #292728", -"y@ c #363233", -"z@ c #332F30", -"A@ c #312D2F", -"B@ c #2A2627", -"C@ c #424040", -"D@ c #454444", -"E@ c #737373", -"F@ c #828282", -"G@ c #939293", -"H@ c #9C9C9C", -"I@ c #A3A3A3", -"J@ c #A9A9A9", -"K@ c #ADADAD", -"L@ c #B2B2B2", -"M@ c #B5B5B5", -"N@ c #A4A4A4", -"O@ c #959595", -"P@ c #8C8C8C", -"Q@ c #707070", -"R@ c #FFFFFF", -" ", -" . + @ # $ % & * = - ; > * - - - * , ' ) ! ~ ", -" = { ' ] ^ { / / ( _ : < [ ^ ^ } ^ | 1 2 } 3 ", -" - 4 ' ' 5 6 6 6 7 7 8 9 ! ! 9 9 0 0 $ 5 a b c ", -" d 4 [ * e - - f g h h h i i j + 5 5 k l m n o p ", -" q _ r @ > > s s t % % * * u v - w 5 x y z A B C ", -" D 1 7 l E F @ @ G H H I > > > J * K L M N O P Q ", -" R S % T U U l V W E X F @ @ > E Y Z ` > .* ..+. ", -" @.#.$.W %.# # # &.l l V E G T *.=.-.*.5 ;.>.,.Z ", -" n '.).[ !.T ~.# ..{.U l ].x Y ^.>.A /.(.x ;.O _. ", -" :.^.<.h a %.%.# # # &.U [.}.|.1.2.3.4.K K a 5.N ", -" 6.i H 7.%.8.# &.# l * % E 9.[.5.0.[.;.a.b.;., %.c. ", -" d.> 0 a # &.e.V V % ^ f.j g - % %.....&.l V l g.h.i. ", -" j./ i # E E @ k.H l.g.%.# l E H <.b.; > % % % m.n.o. ", -" p.q.7 @ ) > % % - r.) > % * * g f s.5 t.i i i u.v.w. ", -" x.y.z.> u - g A.- B.C.D.E.! 0 7 (.6.$ ' ' F.G.).^ H. ", -" I.7 J.K.L.7 7 ! ! m.S 1 m.- %.3.8./ ).M./ | _ : N.; ", -" O., F.f.P.4 4 4 f.f.r / Q.4 4 ^ R.: : 1 [ S.< S T.U. ", -" 4 V.| ).| _ W._ X.^ : Y.1 S.Z.z.] S S `.#.C.C.2 V.q. + ", -" S..+++@+`.#+$+%+&+*+2 #+=+q.y.-+-+-+;+$+$+*+>+++Z.*+,+ ", -" '+S.# $ >+r.m.e.# 6 )+!+~+*+@+B.=+{+-+]+]+^+]+^+j 5 y./+ ", -" (+b.3 _+! m.#+:+q.r > <+[+}+|+3 '.b.8.> e 5 7 ! ^+j 1+2+ ", -" x.] ! r / ^ W.R.S 3+2 y.@+4+5+6+^+~+*+;+7+#+C.#.S.8+: V ", -" 9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+n+p+q+r+s+t+u+v+w+x+y+ ", -" z+A+B+C+d+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+ ", -" `+ @.@+@@@#@$@%@&@*@=@J+-@;@>@,@'@)@!@~@{@c ]@^@/@(@_@:@ ", -" <@[@}@|@1@2@3@F+%@4@5@6@7@-@8@9@9@0@~@a@b@c@#@d@e@f@g@h@ ", -" i@j@k@l@m@n@o@p@q@r@s@t@u@!@l@v@v@w@x@l@y@z@6@A@B@C@D@ ", -" E@F@G@H@I@J@K@}+L@M@M@M@s.}+|+N@H@O@P@F@Q@ ", -" R@R@R@R@R@R@R@R@R@ ", -" ", -" "}; diff --git a/packaging/obs_rpm/gsmartcontrol.spec b/packaging/obs_rpm/gsmartcontrol.spec index 3b4e803..e757f4a 100644 --- a/packaging/obs_rpm/gsmartcontrol.spec +++ b/packaging/obs_rpm/gsmartcontrol.spec @@ -120,7 +120,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/pixmaps/%{name}.png -%{_datadir}/pixmaps/%{name}.xpm %dir %{_datadir}/metainfo %{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/polkit-1/actions/org.%{name}.policy From 71bcfe80e34489969734bde4be891c869e01f3f9 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 16 May 2021 17:57:52 +0200 Subject: [PATCH 3/3] Stop installing app icon in pixmaps location The /usr/share/pixmaps location is considered a legacy location for application icons; since the application icons are already installed in the global XDG hicolor theme, then simply stop installing the 48px one in the legacy pixmaps location. --- data/CMakeLists.txt | 5 ----- data/gsmartcontrol.in.desktop | 2 +- packaging/obs_rpm/gsmartcontrol.spec | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 44d72df..2b760f7 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -37,11 +37,6 @@ endif() # Desktop file if (NOT WIN32) - # Application pixmap (fallback icon for desktop files). - # Same as 48/gsmartcontrol.png. - install(FILES 48/gsmartcontrol.png - DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps/") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/") diff --git a/data/gsmartcontrol.in.desktop b/data/gsmartcontrol.in.desktop index daac53f..b2c2a11 100644 --- a/data/gsmartcontrol.in.desktop +++ b/data/gsmartcontrol.in.desktop @@ -22,7 +22,7 @@ Comment=Monitor and control SMART data on hard disk and solid-state drives Comment[fr]=Surveille et contrôle les données SMART des disques durs et des SSD # If it's a name only, it looks for "name.[png|xpm]" file in -# $XDG_DATA_DIRS/icons and /usr/share/pixmaps. +# $XDG_DATA_DIRS/icons. # An absolute file path is also supported. Icon=gsmartcontrol diff --git a/packaging/obs_rpm/gsmartcontrol.spec b/packaging/obs_rpm/gsmartcontrol.spec index e757f4a..5641183 100644 --- a/packaging/obs_rpm/gsmartcontrol.spec +++ b/packaging/obs_rpm/gsmartcontrol.spec @@ -119,7 +119,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/metainfo %{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/polkit-1/actions/org.%{name}.policy