libre.patch 4.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116
  1. diff -Naurp1 a/meson.build b/meson.build
  2. --- a/meson.build 2020-05-29 20:14:59.000000000 +0600
  3. +++ b/meson.build 2020-10-29 22:27:44.663604055 +0600
  4. @@ -358,10 +358,4 @@ subdir('po')
  5. if get_option('enable-gtk-doc') and not meson.is_cross_build()
  6. - if find_program('gtkdoc-scan', required: true).found()
  7. - subdir('docs/reference')
  8. - else
  9. - message('Not building documentation as gtk-doc was not found')
  10. - endif
  11. endif
  12. if get_option('enable-tests')
  13. - subdir('tests')
  14. endif
  15. diff -Naurp1 a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
  16. --- a/osinfo/osinfo_loader.c 2020-05-29 20:14:59.000000000 +0600
  17. +++ b/osinfo/osinfo_loader.c 2020-10-29 22:13:33.636643566 +0600
  18. @@ -2207,4 +2207,4 @@ static void osinfo_loader_entity_files_a
  19. *
  20. - * $DB_ROOT/os/fedoraproject.org/fedora-19.xml
  21. - * $DB_ROOT/os/fedoraproject.org/fedora-19.d/fragment.xml
  22. + * $DB_ROOT/os/ymirlinux.org/ymir-1.xml
  23. + * $DB_ROOT/os/ymirlinux.org/ymir-1.d/fragment.xml
  24. *
  25. @@ -2212,3 +2212,3 @@ static void osinfo_loader_entity_files_a
  26. *
  27. - * os/fedoraproject.org/fedora-19
  28. + * os/ymirlinux.org/ymir-1
  29. *
  30. diff -Naurp1 a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c
  31. --- a/osinfo/osinfo_os.c 2020-05-29 20:14:59.000000000 +0600
  32. +++ b/osinfo/osinfo_os.c 2020-10-29 22:06:58.046661932 +0600
  33. @@ -163,5 +163,2 @@ osinfo_os_class_init(OsinfoOsClass *klas
  34. * OsinfoOs:distro:
  35. - *
  36. - * The generic distro this OS belongs to, for example fedora, windows,
  37. - * solaris, freebsd etc.
  38. */
  39. @@ -613,5 +610,2 @@ const gchar *osinfo_os_get_family(Osinfo
  40. *
  41. - * Retrieves the generic family the OS @os belongs to, for example fedora,
  42. - * ubuntu, windows, solaris, freebsd etc.
  43. - *
  44. * Returns: (transfer none): the distro of this os
  45. diff -Naurp1 a/osinfo/osinfo_os.h b/osinfo/osinfo_os.h
  46. --- a/osinfo/osinfo_os.h 2020-05-29 20:14:59.000000000 +0600
  47. +++ b/osinfo/osinfo_os.h 2020-10-29 22:11:51.254648319 +0600
  48. @@ -57,9 +57,7 @@ OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLA
  49. * @OSINFO_RELEASE_STATUS_SNAPSHOT: A continuous integration snapshot and not
  50. - * an actual released product yet. For example, gnome-continuous images for
  51. - * development snapshots of GNOME and nightly build ISOs of Fedora etc.
  52. + * an actual released product yet.
  53. * (Since: 0.2.9)
  54. - * @OSINFO_RELEASE_STATUS_PRERELEASE: A pre-release. For example, alpha and
  55. - * beta pre-releases of Fedora etc. (Since: 0.2.9)
  56. + * @OSINFO_RELEASE_STATUS_PRERELEASE: A pre-release. (Since: 0.2.9)
  57. * @OSINFO_RELEASE_STATUS_ROLLING: A rolling version of an OS and thus with no
  58. - * actual releases. For example, Gentoo, Arch Linux, etc. (Since: 1.4.0)
  59. + * actual releases. (Since: 1.4.0)
  60. */
  61. diff -Naurp1 a/osinfo/osinfo_product.c b/osinfo/osinfo_product.c
  62. --- a/osinfo/osinfo_product.c 2020-05-29 20:14:59.000000000 +0600
  63. +++ b/osinfo/osinfo_product.c 2020-10-29 22:10:49.257651198 +0600
  64. @@ -41,5 +41,5 @@
  65. * OsinfoProductRelationship:
  66. - * @OSINFO_PRODUCT_RELATIONSHIP_DERIVES_FROM: a descendent (RHEL-5 derives from Fedora-6)
  67. - * @OSINFO_PRODUCT_RELATIONSHIP_CLONES: a perfect clone (CentOS-5 clones RHEL-5)
  68. - * @OSINFO_PRODUCT_RELATIONSHIP_UPGRADES: a new version release (RHEL-6 upgrades RHEL-4)
  69. + * @OSINFO_PRODUCT_RELATIONSHIP_DERIVES_FROM: a descendent
  70. + * @OSINFO_PRODUCT_RELATIONSHIP_CLONES: a perfect clone
  71. + * @OSINFO_PRODUCT_RELATIONSHIP_UPGRADES: a new version release
  72. *
  73. @@ -57,5 +57,2 @@ struct _OsinfoProductProductLink {
  74. /* <product> 'verbs' <other_product>
  75. - * fedora11 upgrades fedora10
  76. - * centproduct clones rhel
  77. - * scientificlinux derives from rhel
  78. */
  79. diff -Naurp1 a/tools/osinfo-query.c b/tools/osinfo-query.c
  80. --- a/tools/osinfo-query.c 2020-05-29 20:14:59.000000000 +0600
  81. +++ b/tools/osinfo-query.c 2020-10-29 22:24:13.266613870 +0600
  82. @@ -504,32 +504,6 @@ type will be listed.
  83. - # List all operating systems
  84. - $ osinfo-query os
  85. - Short ID | Name ...
  86. - ----------------------+-----------
  87. - centos-6.0 | CentOS 6.0 ...
  88. - centos-6.1 | CentOS 6.1 ...
  89. - ...
  90. -
  91. Conditions allow filtering based on specific properties of an entity.
  92. -For example, to filter only distros from the Fedora Project, use
  93. -
  94. - # List all operating systems
  95. - $ osinfo-query os vendor="Fedora Project"
  96. - Short ID | Name ...
  97. - ----------------------+--------------
  98. - fedora1 | Fedora Core 1 ...
  99. - fedora2 | Fedora Core 2 ...
  100. - ...
  101. The set of fields which are printed can be controlled using the B<--fields>
  102. -command line argument:
  103. -
  104. - # List all operating systems
  105. - $ osinfo-query --fields=short-id,version os vendor="Fedora Project"
  106. - Short ID | Version
  107. - ----------------------+----------
  108. - fedora1 | 1
  109. - fedora2 | 2
  110. - ...
  111. -
  112. +command line argument.