API tools faq
paste
Advertisement
sbaldovi

fuse_mime_02.diff

sbaldovi
Jan 29th, 2012
117
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 15.12 KB | None | 0 0
raw download clone embed print report
  1. Index: configure.in
  2. ===================================================================
  3. --- configure.in    (revision 4652)
  4. +++ configure.in    (working copy)
  5. @@ -681,6 +681,29 @@
  6.  AC_SUBST(COMPAT_SUBDIR)
  7.  AC_SUBST(COMPAT_OSNAME)
  8.  
  9. +dnl Decide if desktop and mime files are installed
  10. +AC_ARG_ENABLE(desktop-integration,
  11. +AS_HELP_STRING([--enable-desktop-integration], [add menu entry and file associations]),
  12. +if test "$enableval" = yes; then desktopintegration=yes; else desktopintegration=no; fi,
  13. +desktdesktopintegration=no)
  14. +AC_MSG_CHECKING(whether to install desktop file)
  15. +AC_MSG_RESULT($desktopintegration)
  16. +AM_CONDITIONAL(DESKTOP_INTEGRATION, test "$desktopintegration" = yes)
  17. +AC_CHECK_PROGS(GTK_UPDATE_ICON_CACHE,gtk-update-icon-cache,true)
  18. +
  19. +dnl Where to install the desktop and mime files
  20. +AC_ARG_WITH(desktop-dir,
  21. +AS_HELP_STRING([--with-desktop-dir=DIR], [location of desktop files (default=datadir)]),
  22. +if test "$withval" = no; then desktopdir=no; else desktopdir=yes; fi,
  23. +desktopdir=no)
  24. +if test "$desktopdir" = yes; then
  25. +  DESKTOP_DATADIR=$with_desktop_dir
  26. +else
  27. +  DESKTOP_DATADIR="$datadir"
  28. +fi
  29. +AM_CONDITIONAL(DESKTOP_DATADIR, test "$desktopdir" == yes)
  30. +AC_SUBST(DESKTOP_DATADIR)
  31. +
  32.  dnl Do we want the low memory compile?
  33.  AC_MSG_CHECKING(whether low memory compile requested)
  34.  AC_ARG_ENABLE(smallmem,
  35. @@ -723,6 +746,7 @@
  36.  compat/unix/Makefile \
  37.  compat/wii/Makefile \
  38.  compat/win32/Makefile \
  39. +data/Makefile \
  40.  debugger/Makefile \
  41.  hacking/Makefile \
  42.  lib/Makefile \
  43.  
  44. Property changes on: data
  45. ___________________________________________________________________
  46. Added: svn:ignore
  47.    + Makefile
  48. Makefile.in
  49.  
  50.  
  51. Index: data/fuse.xml
  52. ===================================================================
  53. --- data/fuse.xml   (revision 0)
  54. +++ data/fuse.xml   (revision 0)
  55. @@ -0,0 +1,103 @@
  56. +<?xml version="1.0" encoding="UTF-8"?>
  57. +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
  58. +  <mime-type type="application/x-spectrum-csw">
  59. +    <comment>ZX Spectrum audio file</comment>
  60. +    <magic>
  61. +      <match type="string" offset="0" value="Compressed Square Wave\x1a"/>
  62. +    </magic>
  63. +    <icon name="application-x-spectrum"/>
  64. +    <glob pattern="*.csw"/>
  65. +  </mime-type>
  66. +  <mime-type type="application/x-spectrum-dsk">
  67. +    <comment>ZX Spectrum disk file</comment>
  68. +    <magic>
  69. +      <match type="string" offset="0" value="MV - CPCEMU Disk-File\x0d\x0aDisk-Info\x0d\x0a"/>
  70. +      <match type="string" offset="0" value="EXTENDED CPC DSK File\x0d\x0aDisk-Info\x0d\x0a"/>
  71. +    </magic>
  72. +    <icon name="application-x-spectrum"/>
  73. +    <glob pattern="*.dsk"/>
  74. +  </mime-type>
  75. +  <mime-type type="application/x-spectrum-pzx">
  76. +    <comment>ZX Spectrum tape file</comment>
  77. +    <magic>
  78. +      <match type="string" offset="0" value="PZXT"/>
  79. +    </magic>
  80. +    <icon name="application-x-spectrum"/>
  81. +    <glob pattern="*.pzx"/>
  82. +  </mime-type>
  83. +  <mime-type type="application/x-spectrum-rzx">
  84. +    <comment>ZX Spectrum action replay</comment>
  85. +    <magic>
  86. +      <match type="string" offset="0" value="RZX!"/>
  87. +    </magic>
  88. +    <icon name="application-x-spectrum"/>
  89. +    <glob pattern="*.rzx"/>
  90. +  </mime-type>
  91. +  <mime-type type="application/x-spectrum-sna">
  92. +    <comment>ZX Spectrum snapshot</comment>
  93. +    <icon name="application-x-spectrum"/>
  94. +    <glob pattern="*.sna"/>
  95. +  </mime-type>
  96. +  <mime-type type="application/x-spectrum-compressed-sna">
  97. +    <comment>ZX Spectrum snapshot (compressed)</comment>
  98. +    <icon name="application-x-spectrum"/>
  99. +    <glob pattern="*.sna.gz"/>
  100. +    <glob pattern="*.sna.bz2"/>
  101. +  </mime-type>
  102. +  <mime-type type="application/x-spectrum-slt">
  103. +    <comment>ZX Spectrum snapshot</comment>
  104. +    <icon name="application-x-spectrum"/>
  105. +    <glob pattern="*.slt"/>
  106. +  </mime-type>
  107. +  <mime-type type="application/x-spectrum-compressed-slt">
  108. +    <comment>ZX Spectrum snapshot (compressed)</comment>
  109. +    <icon name="application-x-spectrum"/>
  110. +    <glob pattern="*.slt.gz"/>
  111. +    <glob pattern="*.slt.bz2"/>
  112. +  </mime-type>
  113. +  <mime-type type="application/x-spectrum-szx">
  114. +    <comment>ZX Spectrum snapshot</comment>
  115. +    <magic>
  116. +      <match type="string" offset="0" value="ZXST"/>
  117. +    </magic>
  118. +    <icon name="application-x-spectrum"/>
  119. +    <glob pattern="*.szx"/>
  120. +    <glob pattern="*.zx-state"/>
  121. +  </mime-type>
  122. +  <mime-type type="application/x-spectrum-tap">
  123. +    <comment>ZX Spectrum tape file</comment>
  124. +    <icon name="application-x-spectrum"/>
  125. +    <glob pattern="*.tap"/>
  126. +  </mime-type>
  127. +  <mime-type type="application/x-spectrum-compressed-tap">
  128. +    <comment>ZX Spectrum tape file (compressed)</comment>
  129. +    <icon name="application-x-spectrum"/>
  130. +    <glob pattern="*.tap.gz"/>
  131. +    <glob pattern="*.tap.bz2"/>
  132. +  </mime-type>
  133. +  <mime-type type="application/x-spectrum-tzx">
  134. +    <comment>ZX Spectrum tape file</comment>
  135. +    <magic>
  136. +      <match type="string" offset="0" value="ZXTape!\x1a"/>
  137. +    </magic>
  138. +    <icon name="application-x-spectrum"/>
  139. +    <glob pattern="*.tzx"/>
  140. +  </mime-type>
  141. +  <mime-type type="application/x-spectrum-compressed-tzx">
  142. +    <comment>ZX Spectrum tape file (compressed)</comment>
  143. +    <icon name="application-x-spectrum"/>
  144. +    <glob pattern="*.tzx.gz"/>
  145. +    <glob pattern="*.tzx.bz2"/>
  146. +  </mime-type>
  147. +  <mime-type type="application/x-spectrum-z80">
  148. +    <comment>ZX Spectrum snapshot</comment>
  149. +    <icon name="application-x-spectrum"/>
  150. +    <glob pattern="*.z80"/>
  151. +  </mime-type>
  152. +  <mime-type type="application/x-spectrum-compressed-z80">
  153. +    <comment>ZX Spectrum snapshot (compressed)</comment>
  154. +    <icon name="application-x-spectrum"/>
  155. +    <glob pattern="*.z80.gz"/>
  156. +    <glob pattern="*.z80.bz2"/>
  157. +  </mime-type>
  158. +</mime-info>
  159. Index: data/Makefile.am
  160. ===================================================================
  161. --- data/Makefile.am    (revision 0)
  162. +++ data/Makefile.am    (revision 0)
  163. @@ -0,0 +1,90 @@
  164. +## Process this file with automake to produce Makefile.in
  165. +## Copyright (c) 2011 Philip Kendall
  166. +
  167. +## $Id$
  168. +
  169. +## This program is free software; you can redistribute it and/or modify
  170. +## it under the terms of the GNU General Public License as published by
  171. +## the Free Software Foundation; either version 2 of the License, or
  172. +## (at your option) any later version.
  173. +##
  174. +## This program is distributed in the hope that it will be useful,
  175. +## but WITHOUT ANY WARRANTY; without even the implied warranty of
  176. +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  177. +## GNU General Public License for more details.
  178. +##
  179. +## You should have received a copy of the GNU General Public License along
  180. +## with this program; if not, write to the Free Software Foundation, Inc.,
  181. +## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  182. +##
  183. +## Author contact information:
  184. +##
  185. +## E-mail: philip-fuse@shadowmagic.org.uk
  186. +
  187. +AUTOMAKE_OPTIONS = foreign
  188. +
  189. +if DESKTOP_INTEGRATION
  190. +
  191. +appdatadir = $(DESKTOP_DATADIR)/applications
  192. +dist_appdata_DATA = fuse.desktop
  193. +
  194. +fusemimedir = $(DESKTOP_DATADIR)/mime/packages
  195. +dist_fusemime_DATA = fuse.xml
  196. +
  197. +iconsdatadir = $(DESKTOP_DATADIR)/icons/hicolor
  198. +icons16dir = $(iconsdatadir)/16x16/apps
  199. +icons32dir = $(iconsdatadir)/32x32/apps
  200. +icons48dir = $(iconsdatadir)/48x48/apps
  201. +icons64dir = $(iconsdatadir)/64x64/apps
  202. +icons128dir = $(iconsdatadir)/128x128/apps
  203. +icons256dir = $(iconsdatadir)/256x256/apps
  204. +
  205. +dist_icons16_DATA = icons/16x16/fuse.png
  206. +dist_icons32_DATA = icons/32x32/fuse.png
  207. +dist_icons48_DATA = icons/48x48/fuse.png
  208. +dist_icons64_DATA = icons/64x64/fuse.png
  209. +dist_icons128_DATA = icons/128x128/fuse.png
  210. +dist_icons256_DATA = icons/256x256/fuse.png
  211. +
  212. +mimeicons16dir = $(iconsdatadir)/16x16/mimetypes
  213. +mimeicons32dir = $(iconsdatadir)/32x32/mimetypes
  214. +mimeicons48dir = $(iconsdatadir)/48x48/mimetypes
  215. +mimeicons64dir = $(iconsdatadir)/64x64/mimetypes
  216. +mimeicons128dir = $(iconsdatadir)/128x128/mimetypes
  217. +mimeicons256dir = $(iconsdatadir)/256x256/mimetypes
  218. +
  219. +dist_mimeicons16_DATA = icons/16x16/application-x-spectrum.png
  220. +dist_mimeicons32_DATA = icons/32x32/application-x-spectrum.png
  221. +dist_mimeicons48_DATA = icons/48x48/application-x-spectrum.png
  222. +dist_mimeicons64_DATA = icons/64x64/application-x-spectrum.png
  223. +dist_mimeicons128_DATA = icons/128x128/application-x-spectrum.png
  224. +dist_mimeicons256_DATA = icons/256x256/application-x-spectrum.png
  225. +
  226. +update-database-cache:
  227. +   @-if test -z "$(DESTDIR)"; then \
  228. +     echo "Updating desktop, mime and icon databases."; \
  229. +     update-desktop-database $(DESKTOP_DATADIR)/applications; \
  230. +     update-mime-database $(DESKTOP_DATADIR)/mime; \
  231. +     touch --no-create $(iconsdatadir); \
  232. +     $(GTK_UPDATE_ICON_CACHE) -t ${iconsdatadir}; \
  233. +   else \
  234. +     echo "*** Not updating desktop, mime and icon databases. After install, run:"; \
  235. +     echo "***   update-desktop-database $(DESKTOP_DATADIR)/applications"; \
  236. +     echo "***   update-mime-database $(DESKTOP_DATADIR)/mime"; \
  237. +     echo "***   touch --no-create $(iconsdatadir)"; \
  238. +     echo "***   gtk-update-icon-cache -t ${iconsdatadir}"; \
  239. +   fi
  240. +
  241. +install-data-hook: update-database-cache
  242. +
  243. +uninstall-hook: update-database-cache
  244. +
  245. +endif
  246. +
  247. +validate: fuse.desktop
  248. +   ( dfvalidate=`which desktop-file-validate`; \
  249. +     if test x$$dfvalidate != x && test -x $$dfvalidate; then \
  250. +            $$dfvalidate $< || ( echo "* $< INVALID *"; exit 1 ) \
  251. +     fi )
  252. +
  253. +dist-hook: validate
  254. Index: data/fuse.desktop
  255. ===================================================================
  256. --- data/fuse.desktop   (revision 0)
  257. +++ data/fuse.desktop   (revision 0)
  258. @@ -0,0 +1,10 @@
  259. +[Desktop Entry]
  260. +Version=1.0
  261. +Type=Application
  262. +Categories=Game;Emulator;GNOME;GTK;
  263. +Name=Fuse Spectrum Emulator
  264. +Comment=Emulator of the 1980s ZX Spectrum home computer and its various clones
  265. +MimeType=application/x-spectrum-csw;application/x-spectrum-dsk;application/x-spectrum-pzx;application/x-spectrum-rzx;application/x-spectrum-slt;application/x-spectrum-compressed-slt;application/x-spectrum-sna;application/x-spectrum-compressed-sna;application/x-spectrum-szx;application/x-spectrum-tap;application/x-spectrum-compressed-tap;application/x-spectrum-tzx;application/x-spectrum-compressed-tzx;audio/x-wav;application/x-spectrum-z80;application/x-spectrum-compressed-z80;
  266. +Exec=fuse %f
  267. +Icon=fuse
  268. +
  269. Index: data/icons/48x48/fuse.png
  270. ===================================================================
  271. Cannot display: file marked as a binary type.
  272. svn:mime-type = application/octet-stream
  273.  
  274. Property changes on: data/icons/48x48/fuse.png
  275. ___________________________________________________________________
  276. Added: svn:mime-type
  277.    + application/octet-stream
  278.  
  279. Index: data/icons/48x48/application-x-spectrum.png
  280. ===================================================================
  281. Cannot display: file marked as a binary type.
  282. svn:mime-type = application/octet-stream
  283.  
  284. Property changes on: data/icons/48x48/application-x-spectrum.png
  285. ___________________________________________________________________
  286. Added: svn:mime-type
  287.    + application/octet-stream
  288.  
  289. Index: data/icons/32x32/fuse.png
  290. ===================================================================
  291. Cannot display: file marked as a binary type.
  292. svn:mime-type = application/octet-stream
  293.  
  294. Property changes on: data/icons/32x32/fuse.png
  295. ___________________________________________________________________
  296. Added: svn:mime-type
  297.    + application/octet-stream
  298.  
  299. Index: data/icons/32x32/application-x-spectrum.png
  300. ===================================================================
  301. Cannot display: file marked as a binary type.
  302. svn:mime-type = application/octet-stream
  303.  
  304. Property changes on: data/icons/32x32/application-x-spectrum.png
  305. ___________________________________________________________________
  306. Added: svn:mime-type
  307.    + application/octet-stream
  308.  
  309. Index: data/icons/256x256/fuse.png
  310. ===================================================================
  311. Cannot display: file marked as a binary type.
  312. svn:mime-type = application/octet-stream
  313.  
  314. Property changes on: data/icons/256x256/fuse.png
  315. ___________________________________________________________________
  316. Added: svn:mime-type
  317.    + application/octet-stream
  318.  
  319. Index: data/icons/256x256/application-x-spectrum.png
  320. ===================================================================
  321. Cannot display: file marked as a binary type.
  322. svn:mime-type = application/octet-stream
  323.  
  324. Property changes on: data/icons/256x256/application-x-spectrum.png
  325. ___________________________________________________________________
  326. Added: svn:mime-type
  327.    + application/octet-stream
  328.  
  329. Index: data/icons/16x16/fuse.png
  330. ===================================================================
  331. Cannot display: file marked as a binary type.
  332. svn:mime-type = application/octet-stream
  333.  
  334. Property changes on: data/icons/16x16/fuse.png
  335. ___________________________________________________________________
  336. Added: svn:mime-type
  337.    + application/octet-stream
  338.  
  339. Index: data/icons/16x16/application-x-spectrum.png
  340. ===================================================================
  341. Cannot display: file marked as a binary type.
  342. svn:mime-type = application/octet-stream
  343.  
  344. Property changes on: data/icons/16x16/application-x-spectrum.png
  345. ___________________________________________________________________
  346. Added: svn:mime-type
  347.    + application/octet-stream
  348.  
  349. Index: data/icons/64x64/fuse.png
  350. ===================================================================
  351. Cannot display: file marked as a binary type.
  352. svn:mime-type = application/octet-stream
  353.  
  354. Property changes on: data/icons/64x64/fuse.png
  355. ___________________________________________________________________
  356. Added: svn:mime-type
  357.    + application/octet-stream
  358.  
  359. Index: data/icons/64x64/application-x-spectrum.png
  360. ===================================================================
  361. Cannot display: file marked as a binary type.
  362. svn:mime-type = application/octet-stream
  363.  
  364. Property changes on: data/icons/64x64/application-x-spectrum.png
  365. ___________________________________________________________________
  366. Added: svn:mime-type
  367.    + application/octet-stream
  368.  
  369. Index: data/icons/128x128/fuse.png
  370. ===================================================================
  371. Cannot display: file marked as a binary type.
  372. svn:mime-type = application/octet-stream
  373.  
  374. Property changes on: data/icons/128x128/fuse.png
  375. ___________________________________________________________________
  376. Added: svn:mime-type
  377.    + application/octet-stream
  378.  
  379. Index: data/icons/128x128/application-x-spectrum.png
  380. ===================================================================
  381. Cannot display: file marked as a binary type.
  382. svn:mime-type = application/octet-stream
  383.  
  384. Property changes on: data/icons/128x128/application-x-spectrum.png
  385. ___________________________________________________________________
  386. Added: svn:mime-type
  387.    + application/octet-stream
  388.  
  389. Index: Makefile.am
  390. ===================================================================
  391. --- Makefile.am (revision 4652)
  392. +++ Makefile.am (working copy)
  393. @@ -26,6 +26,7 @@
  394.  bin_PROGRAMS = fuse
  395.  
  396.  SUBDIRS = @COMPAT_SUBDIR@ \
  397. +     data \
  398.       debugger \
  399.       hacking \
  400.       lib \
  401. @@ -41,7 +42,8 @@
  402.       unittests \
  403.       z80
  404.  
  405. -DIST_SUBDIRS = debugger \
  406. +DIST_SUBDIRS = data \
  407. +          debugger \
  408.            hacking \
  409.            lib \
  410.            machines \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!