gplugin/gplugin

merging
develop
2019-01-21, Gary Kramlich
54ba6e385993
Parents dc0114366664bd7901188be1
Children 692d04c3e3df
merging
16 files changed, 5 insertions(+), 30 deletions(-)
  • +0 -2
    gplugin-gtk/gplugin-gtk-plugin-info.h
  • +0 -2
    gplugin-gtk/gplugin-gtk-store.h
  • +0 -2
    gplugin-gtk/gplugin-gtk-view.h
  • +2 -1
    gplugin-gtk/meson.build
  • +0 -2
    gplugin/gplugin-core.h
  • +0 -2
    gplugin/gplugin-loader.h
  • +0 -2
    gplugin/gplugin-manager.h
  • +0 -2
    gplugin/gplugin-native-loader.h
  • +0 -2
    gplugin/gplugin-native-plugin.h
  • +0 -2
    gplugin/gplugin-native-private.h
  • +0 -2
    gplugin/gplugin-options.h
  • +0 -2
    gplugin/gplugin-plugin-info.h
  • +0 -2
    gplugin/gplugin-plugin.h
  • +0 -2
    gplugin/gplugin-private.h
  • +1 -2
    gplugin/gplugin-version.h.in
  • +2 -1
    gplugin/meson.build
    • --- a/gplugin-gtk/gplugin-gtk-plugin-info.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin-gtk/gplugin-gtk-plugin-info.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GTK_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_GTK_COMPILATION)
    #error "only <gplugin/gplugin-gtk.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_GTK_PLUGIN_INFO_H
    #define GPLUGIN_GTK_PLUGIN_INFO_H
    --- a/gplugin-gtk/gplugin-gtk-store.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin-gtk/gplugin-gtk-store.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GTK_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_GTK_COMPILATION)
    #error "only <gplugin/gplugin-gtk.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_GTK_STORE_H
    #define GPLUGIN_GTK_STORE_H
    --- a/gplugin-gtk/gplugin-gtk-view.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin-gtk/gplugin-gtk-view.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GTK_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_GTK_COMPILATION)
    #error "only <gplugin/gplugin-gtk.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_GTK_VIEW_H
    #define GPLUGIN_GTK_VIEW_H
    --- a/gplugin-gtk/meson.build Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin-gtk/meson.build Mon Jan 21 20:29:24 2019 -0600
    @@ -121,7 +121,8 @@
    namespace : 'GPluginGtk',
    symbol_prefix : 'gplugin_gtk',
    nsversion : '@0@.0'.format(GPLUGIN_MAJOR_VERSION),
    - install : true)
    + install : true,
    + extra_args : ['--quiet', '-DGPLUGIN_GTK_COMPILATION'])
    endif
    ###############################################################################
    --- a/gplugin/gplugin-core.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-core.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_CORE_H
    #define GPLUGIN_CORE_H
    --- a/gplugin/gplugin-loader.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-loader.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_LOADER_H
    #define GPLUGIN_LOADER_H
    --- a/gplugin/gplugin-manager.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-manager.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_MANAGER_H
    #define GPLUGIN_MANAGER_H
    --- a/gplugin/gplugin-native-loader.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-native-loader.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> or <gplugin-native.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_NATIVE_LOADER_H
    #define GPLUGIN_NATIVE_LOADER_H
    --- a/gplugin/gplugin-native-plugin.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-native-plugin.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> or <gplugin-native.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_NATIVE_PLUGIN_H
    #define GPLUGIN_NATIVE_PLUGIN_H
    --- a/gplugin/gplugin-native-private.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-native-private.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin-native.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_NATIVE_PRIVATE_H
    #define GPLUGIN_NATIVE_PRIVATE_H
    --- a/gplugin/gplugin-options.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-options.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_OPTIONS_H
    #define GPLUGIN_OPTIONS_H
    --- a/gplugin/gplugin-plugin-info.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-plugin-info.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_PLUGIN_INFO_H
    #define GPLUGIN_PLUGIN_INFO_H
    --- a/gplugin/gplugin-plugin.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-plugin.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_PLUGIN_H
    #define GPLUGIN_PLUGIN_H
    --- a/gplugin/gplugin-private.h Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-private.h Mon Jan 21 20:29:24 2019 -0600
    @@ -15,11 +15,9 @@
    * License along with this library; if not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_PRIVATE_H
    #define GPLUGIN_PRIVATE_H
    --- a/gplugin/gplugin-version.h.in Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/gplugin-version.h.in Mon Jan 21 20:29:24 2019 -0600
    @@ -14,11 +14,10 @@
    * You should have received a copy of the GNU General Public License
    * along with this program. If not, see <http://www.gnu.org/licenses/>.
    */
    -#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
    +
    #if !defined(GPLUGIN_GLOBAL_HEADER_INSIDE) && !defined(GPLUGIN_COMPILATION)
    #error "only <gplugin.h> may be included directly"
    #endif
    -#endif /* __GI_SCANNER__ */
    #ifndef GPLUGIN_VERSION_H
    #define GPLUGIN_VERSION_H
    --- a/gplugin/meson.build Mon Jan 21 20:29:03 2019 -0600
    +++ b/gplugin/meson.build Mon Jan 21 20:29:24 2019 -0600
    @@ -259,7 +259,8 @@
    namespace : 'GPlugin',
    symbol_prefix : 'gplugin',
    nsversion : '@0@.0'.format(GPLUGIN_MAJOR_VERSION),
    - install : true)
    + install : true,
    + extra_args : ['--quiet', '-DGPLUGIN_COMPILATION'])
    endif
    ###############################################################################